diff options
| author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-29 13:44:48 +0000 |
|---|---|---|
| committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-29 13:44:48 +0000 |
| commit | 9a9a139780c6deb822811e2dc799ba6d9cc8ffc6 (patch) | |
| tree | a984bcdf7a6ef442530d6fcd5e92ab9f4955ac51 | |
| parent | c386d519a1a381ba1c7628f4e659142eebb5fd48 (diff) | |
| download | ruby-9a9a139780c6deb822811e2dc799ba6d9cc8ffc6.tar.gz ruby-9a9a139780c6deb822811e2dc799ba6d9cc8ffc6.tar.xz ruby-9a9a139780c6deb822811e2dc799ba6d9cc8ffc6.zip | |
Remove conflict from Changelog
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -28,7 +28,6 @@ Thu Jan 29 17:03:49 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>. [ruby-dev:22761] ->>>>>>> 1.2844 Thu Jan 29 11:32:14 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp> * test/rss/test_*: do $: trick while searching a module in the current |