From: Marco Barisione <mbari@src.gnome.org>
Date: Sat, 17 Mar 2007 14:01:24 +0000 (+0000)
Subject: Removed a conflict delimiter (">>>>>>> .r5422")
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2920c533b8f274f0f104c78ee5988ad9b73db176;p=dana%2Fcg-glib.git

Removed a conflict delimiter (">>>>>>> .r5422")

svn path=/trunk/; revision=5424
---

diff --git a/ChangeLog b/ChangeLog
index abadb956..99e3fe9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,7 +66,6 @@ Fri Mar 16 11:24:51 2007  Tim Janik  <timj@imendio.com>
 	* glib/gscanner.c (g_scanner_get_token_ll): Fix a typo
 	in the last commit.  (#415323, Richard Hult)
 
->>>>>>> .r5422
 2007-03-15  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gnulib/Makefile.am (INCLUDES): Add -I$(top_srcdir)/glib so