1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove conflict from Changelog

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
dave 2004-01-29 13:44:48 +00:00
parent 6dbf1140a4
commit ef98285928
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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>. * dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
[ruby-dev:22761] [ruby-dev:22761]
>>>>>>> 1.2844
Thu Jan 29 11:32:14 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp> 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 * test/rss/test_*: do $: trick while searching a module in the current