1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 729497b82e..a01bdb6d58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,7 +18,6 @@ Wed Feb 18 22:42:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/rinda/test_rinda.rb: improt test_rinda.rb
 
->>>>>>> 1.2947
 Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/*: should not depend on $KCODE.