diff --git a/doc/ChangeLog b/doc/ChangeLog
index 71cf742c9..bc588173c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2003-07-12  Duncan Mak  <duncan@ximian.com>
 
 	* en/Gtk/TextBuffer.xml: all documented except for events.