From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Mon, 9 Jul 2001 16:22:16 +0000 (+0000)
Subject: remove conflict marker...
X-Git-Tag: VERSION_0_5_0~8
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=75dc11e42fbb9dcfbcdfe461620b7e4cb447b5b1

remove conflict marker...
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index eaddde590..d78010890 100644
--- 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