diff --git a/ChangeLog b/ChangeLog
index f48fbf7a9..43942c56d 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