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 | 3edf43c4cfe9df91ba30888fb631eec036595f88 (patch) | |
| tree | fd9715eac15f26bd9b10dc7ed3949ffd48d3817c /include/ruby | |
| parent | 389278af977066c5c8b077432920db6df89fcd6a (diff) | |
ChangeLog: conflict mark removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
0 files changed, 0 insertions, 0 deletions