projects / claws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1c59cd9)
don't forget to remove conflict marker...
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 25 Oct 2001 13:24:16 +0000 (13:24 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 25 Oct 2001 13:24:16 +0000 (13:24 +0000)
ChangeLog.claws patch | blob | history

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c6a7987ecf811dddb9c6963f3adad407e89f0c93..4ce4fe4f90d602b4b741f00db392106af9015dad 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -75,7 +75,6 @@
 
        * correct Alfons' last ChangeLog.claws entry
 
->>>>>>> 1.398
 2001-10-19 [alfons]
 
        * src/pgptext.[ch]
Claws Mail