removed conflict indicator

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-02-18 15:28:18 +00:00 · 2004-02-18 15:28:18 +00:00 · fbac5a54a1
--- a/1
+++ b/1
@ -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.