diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 15:59:24 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 15:59:24 +0000 |
| commit | a55a114b1268d48d73446357f4480514c237f922 (patch) | |
| tree | fd9715eac15f26bd9b10dc7ed3949ffd48d3817c /tool/serb.rb | |
| parent | b93e3af238b3d3890cfda61200b6018a2484a138 (diff) | |
| download | ruby-a55a114b1268d48d73446357f4480514c237f922.tar.gz ruby-a55a114b1268d48d73446357f4480514c237f922.tar.xz ruby-a55a114b1268d48d73446357f4480514c237f922.zip | |
ChangeLog: conflict mark removed.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/serb.rb')
0 files changed, 0 insertions, 0 deletions