From 3f9ade643637c98fa8940fc871c308257e5f64eb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 29 Apr 2005 14:45:36 +0000 Subject: [PATCH] Remove conflict markers --- ChangeLog | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-8 | 1 - 3 files changed, 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a867a8f75d..95ca30919f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,7 +136,6 @@ Enter the "user-resized" state of the column only if a drag actually changes the column width, not on any click. ->>>>>>> 1.6531 2005-04-07 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a867a8f75d..95ca30919f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -136,7 +136,6 @@ Enter the "user-resized" state of the column only if a drag actually changes the column width, not on any click. ->>>>>>> 1.6531 2005-04-07 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a867a8f75d..95ca30919f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -136,7 +136,6 @@ Enter the "user-resized" state of the column only if a drag actually changes the column width, not on any click. ->>>>>>> 1.6531 2005-04-07 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background