Commit b4327f13 authored by Michael Natterer's avatar Michael Natterer

Remove conflict marker.

svn path=/trunk/; revision=18989
parent 24a6e04c
......@@ -33,7 +33,6 @@
* gtk/gtkbuilder.c: Convert delayed_properties hashtable to linked
list. Fixes #495769.
>>>>>>> .r18986
2007-11-10 Matthias Clasen <>
* tests/buildertest.c: Parse a file given on the cmdline.
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