1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ffba411..7002d737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,7 +68,6 @@
 	* ext/annodex/gstskeltag.h:
 	  Deleted; these files aren't used any more either.
 
->>>>>>> 1.2189
 2006-02-25  Julien MOUTTE  <julien@moutte.net>
 
 	* ext/Makefile.am: Fix dist-check.