diff --git a/po/ChangeLog b/po/ChangeLog
index 8b477da8661e4e33e9d38c68d0abefcde8978103..e0f59ce6a3122a9862504832aef1fabbc6d7148e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -50,7 +50,6 @@
 	  hu.po, it.po, ja.po, nl.po, pl.po, pt_BR.po, ru.po, sv.po:
 	  Update translations.
 
->>>>>>> .r20160
 2006-02-25  Stavros Giannouris <stavrosg2002@freemail.gr>
 
 	* el.po: Updated Greek translations