diff options
author | why <why@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-07 19:38:22 +0000 |
---|---|---|
committer | why <why@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-07 19:38:22 +0000 |
commit | dcff777f116bd4f39049bd137cf425a3adf9c49a (patch) | |
tree | 2252af28a0e1788958f160a4b6b570bbd53ad311 /.document | |
parent | 36fc61901d32a517e38772b48fb186d0e4ab05b8 (diff) |
* ChangeLog: left a conflict indicator in there, sorry.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to '.document')
0 files changed, 0 insertions, 0 deletions