forked from AuroraMiddleware/gtk
Remove conflict markers
This commit is contained in:
parent
7d2d8182b4
commit
3f9ade6436
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user