diff --git a/ChangeLog b/ChangeLog
index f6cc89a6b..47c72bd8a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,7 +37,6 @@ $Source$
       on standard 800x600 browser windows.
 
 2003-02-27 Michal Cihar  <nijel@users.sourceforge.net>
->>>>>>> 1.2120
     * lang/czech: Updated.
     * lang/english: Resorted.