Commit 77ae64b8 authored by Sven Neumann's avatar Sven Neumann
Browse files

removed leftover CVS conflict markers

parent 5dcae734
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
* gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix * gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix
a cast. a cast.
>>>>>>> 1.7541
2006-02-17 Matthias Clasen <mclasen@redhat.com> 2006-02-17 Matthias Clasen <mclasen@redhat.com>
DND keynav support: DND keynav support:
...@@ -140,7 +139,6 @@ ...@@ -140,7 +139,6 @@
* gtk/gtkcolorbutton.c (gtk_color_button_[un]realize): * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize):
Remove unnecessary checks. Remove unnecessary checks.
>>>>>>> 1.7533
2006-02-12 Matthias Clasen <mclasen@redhat.com> 2006-02-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working
......
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
* gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix * gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix
a cast. a cast.
>>>>>>> 1.7541
2006-02-17 Matthias Clasen <mclasen@redhat.com> 2006-02-17 Matthias Clasen <mclasen@redhat.com>
DND keynav support: DND keynav support:
...@@ -140,7 +139,6 @@ ...@@ -140,7 +139,6 @@
* gtk/gtkcolorbutton.c (gtk_color_button_[un]realize): * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize):
Remove unnecessary checks. Remove unnecessary checks.
>>>>>>> 1.7533
2006-02-12 Matthias Clasen <mclasen@redhat.com> 2006-02-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment