remove conflict marker...

[claws.git] / ChangeLog.claws

diff --git a/ChangeLog.claws b/ChangeLog.claws
index eaddde59019ca42165007eafc38a2cbaab459d54..d780108902ce8de0b5fdfc5f17e14e6a66927ab0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -25,7 +25,6 @@
        * src/scoring.c
                bugfix of the config file parser
 
->>>>>>> 1.205
 2001-07-08 [alfons]
 
        * src/Makefile.am