diff --git a/po/ChangeLog b/po/ChangeLog
index 6ac01ca2f5..f004ec62ab 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1378,7 +1378,6 @@
 	* nb.po: Updated Norwegian bokmål translation.
 	* no.po: Same.
 
->>>>>>> 1.2514
 2006-02-17  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated by Tino Meinen.