From 77ae64b8abe89522d279068a8af8c5ba46aede1a Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 21 Feb 2006 08:49:47 +0000 Subject: [PATCH] removed leftover CVS conflict markers --- ChangeLog | 2 -- ChangeLog.pre-2-10 | 2 -- 2 files changed, 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01857f23f4..1ebfce3cfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,7 +101,6 @@ * gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix a cast. ->>>>>>> 1.7541 2006-02-17 Matthias Clasen DND keynav support: @@ -140,7 +139,6 @@ * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize): Remove unnecessary checks. ->>>>>>> 1.7533 2006-02-12 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 01857f23f4..1ebfce3cfd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -101,7 +101,6 @@ * gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix a cast. ->>>>>>> 1.7541 2006-02-17 Matthias Clasen DND keynav support: @@ -140,7 +139,6 @@ * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize): Remove unnecessary checks. ->>>>>>> 1.7533 2006-02-12 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working