From 4ea52b4510b777e55b580e0a78486b6e1e144a1c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 15 Mar 2005 14:58:52 +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 ad04a58f8a..db7efc65f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,7 +42,6 @@ try to focus the default_widget if there is none. (#169881, Thomas Leonard) ->>>>>>> 1.6286.2.112 2005-03-09 Matthias Clasen * gtk/gtkaccelgroup.c (substitute_underscores): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ad04a58f8a..db7efc65f6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -42,7 +42,6 @@ try to focus the default_widget if there is none. (#169881, Thomas Leonard) ->>>>>>> 1.6286.2.112 2005-03-09 Matthias Clasen * gtk/gtkaccelgroup.c (substitute_underscores): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ad04a58f8a..db7efc65f6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -42,7 +42,6 @@ try to focus the default_widget if there is none. (#169881, Thomas Leonard) ->>>>>>> 1.6286.2.112 2005-03-09 Matthias Clasen * gtk/gtkaccelgroup.c (substitute_underscores): Remove