diff --git a/ChangeLog b/ChangeLog index 805e2ce10e..8adaf74b75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. ->>>>>>> 1.5032 Thu Feb 26 15:43:43 2004 Owen Taylor * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 805e2ce10e..8adaf74b75 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. ->>>>>>> 1.5032 Thu Feb 26 15:43:43 2004 Owen Taylor * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 805e2ce10e..8adaf74b75 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. ->>>>>>> 1.5032 Thu Feb 26 15:43:43 2004 Owen Taylor * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 805e2ce10e..8adaf74b75 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. ->>>>>>> 1.5032 Thu Feb 26 15:43:43 2004 Owen Taylor * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 805e2ce10e..8adaf74b75 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. ->>>>>>> 1.5032 Thu Feb 26 15:43:43 2004 Owen Taylor * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality