archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 19:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* ChangeLog: remove a conflict tag

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2004-10-18 07:14:03 +00:00
parent da155576ad
commit 9146e09a4f
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -75,7 +75,6 @@ Sat Oct 16 13:34:56 2004 Kouhei Sutou <kou@cozmixng.org>
* lib/rss: supported prety print. * lib/rss: supported prety print.
* test/rss/test_1.0.rb: added test for calculating default indent size. * test/rss/test_1.0.rb: added test for calculating default indent size.
>>>>>>> 1.2673.2.531
Fri Oct 15 18:04:35 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Fri Oct 15 18:04:35 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is * ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is