summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgsinclair <gsinclair@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-18 15:28:18 +0000
committergsinclair <gsinclair@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-18 15:28:18 +0000
commitfbac5a54a1458a70adf55f2e0c7908f4ce54f63e (patch)
treed205f79c19bfb03c973956d88d808f3106f7dbd2
parent1399c1bca04aa992ef2a2b6bda70298f37892823 (diff)
removed conflict indicator
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 729497b..a01bdb6 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.