Remove conflict marker.

svn path=/trunk/; revision=18989
2007-11-14 09:45:59 +00:00
parent 24a6e04cb2
commit b4327f13ed
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@@ -33,7 +33,6 @@
 	* gtk/gtkbuilder.c: Convert delayed_properties hashtable to linked
 	list.  Fixes #495769.

->>>>>>> .r18986
 2007-11-10  Matthias Clasen  <mclasen@redhat.com>

 	* tests/buildertest.c: Parse a file given on the cmdline.