diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-08 01:24:00 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-08 01:24:00 +0000 |
| commit | 22bcf22ea4ed3a49c497679c5fa82b6542787a47 (patch) | |
| tree | b86bc78ac991daccd33aecde1ea5472e25155f42 /include/ruby | |
| parent | 2677f72e2e8088abd77db2bb8895a1bb94335a3e (diff) | |
ChangeLog: conflict resolution
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
0 files changed, 0 insertions, 0 deletions