aboutsummaryrefslogtreecommitdiffstats
path: root/version.h
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-29 13:44:48 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-29 13:44:48 +0000
commitef98285928af6533fb2ff210683a86f78d9e03d9 (patch)
treea984bcdf7a6ef442530d6fcd5e92ab9f4955ac51 /version.h
parent6dbf1140a4989e7b63c5ad22d131d01fb6a0c474 (diff)
downloadruby-ef98285928af6533fb2ff210683a86f78d9e03d9.tar.gz
Remove conflict from Changelog
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
0 files changed, 0 insertions, 0 deletions