diff --git a/ChangeLog b/ChangeLog
index 1034e14374..8f78939b49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,6 @@
 	* gtk/gtkbuilder.c: Convert delayed_properties hashtable to linked
 	list.  Fixes #495769.
 
->>>>>>> .r18986
 2007-11-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* tests/buildertest.c: Parse a file given on the cmdline.