diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-18 07:14:03 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-18 07:14:03 +0000 |
| commit | 6f9e5cd7d8956737b2aa6c51d90ead7e93ea8999 (patch) | |
| tree | 80f41538a0a5c4bb168ecb895a49aab1fd70c66b /ChangeLog | |
| parent | 0f45784681bfc6cdfba2654b55da0c5fc3ef8874 (diff) | |
| download | ruby-6f9e5cd7d8956737b2aa6c51d90ead7e93ea8999.tar.gz ruby-6f9e5cd7d8956737b2aa6c51d90ead7e93ea8999.tar.xz ruby-6f9e5cd7d8956737b2aa6c51d90ead7e93ea8999.zip | |
* ChangeLog: remove a conflict tag
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -75,7 +75,6 @@ Sat Oct 16 13:34:56 2004 Kouhei Sutou <kou@cozmixng.org> * lib/rss: supported prety print. * 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> * ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is |