From fbac5a54a1458a70adf55f2e0c7908f4ce54f63e Mon Sep 17 00:00:00 2001
From: gsinclair <gsinclair@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 18 Feb 2004 15:28:18 +0000
Subject: removed conflict indicator

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.
-- 
cgit v1.2.3