From b4327f13ed59eab3e8e45c9ae7cf9283634991da Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@src.gnome.org>
Date: Wed, 14 Nov 2007 09:45:59 +0000
Subject: [PATCH] Remove conflict marker.

svn path=/trunk/; revision=18989
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1034e14374..8f78939b49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.