diff options
| author | gsinclair <gsinclair@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-18 15:28:18 +0000 |
|---|---|---|
| committer | gsinclair <gsinclair@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-18 15:28:18 +0000 |
| commit | cbebe1b0e2e22a33aadcb3893000c3e2e199323f (patch) | |
| tree | d205f79c19bfb03c973956d88d808f3106f7dbd2 | |
| parent | ca167baba1d35613e2580b8315aeea20340b1235 (diff) | |
| download | ruby-cbebe1b0e2e22a33aadcb3893000c3e2e199323f.tar.gz ruby-cbebe1b0e2e22a33aadcb3893000c3e2e199323f.tar.xz ruby-cbebe1b0e2e22a33aadcb3893000c3e2e199323f.zip | |
removed conflict indicator
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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. |