From c454838599cf1ee51cd4d932e4583591c858afb2 Mon Sep 17 00:00:00 2001
From: Robin Johnson <robbat2@users.sourceforge.net>
Date: Sat, 1 Mar 2003 11:45:41 +0000
Subject: [PATCH] Cleanup

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.