Commit 3f9ade64 authored by Matthias Clasen's avatar Matthias Clasen

Remove conflict markers

parent 7d2d8182
......@@ -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 <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_paint): Allow setting background
......
......@@ -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 <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_paint): Allow setting background
......
......@@ -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 <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_paint): Allow setting background
......
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