From 0c4b3dcae10a926b9df5cdb3e5912973bd4554d5 Mon Sep 17 00:00:00 2001
From: Duncan Mak <duncan@mono-cvs.ximian.com>
Date: Sat, 12 Jul 2003 09:23:26 +0000
Subject: [PATCH] Remove conflict marker.

svn path=/trunk/gtk-sharp/; revision=16136
---
 doc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.