diff --git a/ChangeLog b/ChangeLog
index 6e1f42e38..a53306930 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 2005-06-10  Dan Winship  <danw@novell.com>
 
 	* parser/gapi2xml.pl (addPropElem): Distinguish CONSTRUCT ("must
@@ -11,13 +10,11 @@
 	* gtk/gtk-api-2.6.raw: Regen, causing a few formerly-read-only
 	properties to become writable.
 
-=======
 2005-06-10  Mike Kestner  <mkestner@novell.com>
 
 	* glade/XML.custom : add a try block on field autoconnect to make it
 	easier to catch type mismatches and such.  Suggestion from Gonzalito.
 
->>>>>>> .r45766
 2005-06-09  Lluis Sanchez  <lluis@novell.com>
 
 	* glib/Marshaller.cs: Added null check in FilenamePtrToString.