diff --git a/ChangeLog b/ChangeLog
index bb2a096ade..917f86072d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -197,7 +197,6 @@ Sat Mar 25 20:57:24 CET 2000  Stanislav Brabec  <utx@penguin.cz>
 	busy. This is not really what we want but at least it prevents
 	crashes.
 
->>>>>>> 1.2476
 2000-03-25  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/script-fu/script-fu-console.c: only call gtk_main_quit()