From 79dbfed1585cb40ed9a3b15dcb98df2d58adc558 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sat, 12 Jan 2002 17:48:45 +0000 Subject: [PATCH] Removed conflict markers from ChangeLog. --- ChangeLog | 1 - ChangeLog.pre-2-0 | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 7 files changed, 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10ca8f3a3..8c2944aee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik * gtk/gtktreesortable.h : ditto. * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type. ->>>>>>> 1.2791 2002-01-08 Matthias Clasen * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 10ca8f3a3..8c2944aee 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik * gtk/gtktreesortable.h : ditto. * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type. ->>>>>>> 1.2791 2002-01-08 Matthias Clasen * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 10ca8f3a3..8c2944aee 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik * gtk/gtktreesortable.h : ditto. * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type. ->>>>>>> 1.2791 2002-01-08 Matthias Clasen * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 10ca8f3a3..8c2944aee 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik * gtk/gtktreesortable.h : ditto. * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type. ->>>>>>> 1.2791 2002-01-08 Matthias Clasen * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 10ca8f3a3..8c2944aee 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik * gtk/gtktreesortable.h : ditto. * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type. ->>>>>>> 1.2791 2002-01-08 Matthias Clasen * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 10ca8f3a3..8c2944aee 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik * gtk/gtktreesortable.h : ditto. * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type. ->>>>>>> 1.2791 2002-01-08 Matthias Clasen * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 10ca8f3a3..8c2944aee 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik * gtk/gtktreesortable.h : ditto. * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type. ->>>>>>> 1.2791 2002-01-08 Matthias Clasen * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather -- 2.43.2