From: Tor Lillqvist <tml@src.gnome.org>
Date: Sun, 18 May 2008 19:46:49 +0000 (+0000)
Subject: Remove leftover svn conflict indicator.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=78bdc9397b8b63b9dc3a8ed4e62845442cb859ae;p=dana%2Fcg-glib.git

Remove leftover svn conflict indicator.

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

diff --git a/ChangeLog b/ChangeLog
index f48fbf7a..43942c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,7 +60,6 @@
 
 	* glib/gi18n.c: #include <locale.h> to fix the build.
 
->>>>>>> .r6902
 2008-05-12  Yair Hershkovitz  <yairhr@gmail.com>
 
 	* glib/gi18n.c (g_i18n_init): Coding convention fix. Space between