diff --git a/ChangeLog b/ChangeLog
index a0524f239d..61f6a3d283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -435,7 +435,6 @@ Fri Mar 12 21:30:57 GMT 1999 Andy Thomas <alt@gimp.org>
 	Thanks to Tan Koan-Sin <freedom@csie.nctu.edu.tw> for pointing 
 	this out.
 
->>>>>>> 1.923
 Fri Mar 12 22:15:49 CET 1999 Marc Lehmann <pcg@goof.com>
 
         * libgimp/gimp.c: split gimp_quit into two functions, gimp_quit