Removed conflict markers from ChangeLog.

[~andy/gtk] / ChangeLog.pre-2-4

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 10ca8f3a3d754fb5d23e817cdb3e1c6509cdc278..8c2944aee520371a964f7994e229b6c35c2585f5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -223,7 +223,6 @@ Wed Jan  9 11:23:39 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtktreesortable.h : ditto.
        * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
 
->>>>>>> 1.2791
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather