diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-18 09:37:34 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-18 09:37:34 +0000 |
commit | ab34f43ae82e6254086a3296092c6ba5955ba64b (patch) | |
tree | abad2b356a739b76e076cf7e1acdee58e4b01a16 /lib/time.rb | |
parent | b487727ea43de143996d0a802813bbf39ee2b043 (diff) | |
download | ruby-ab34f43ae82e6254086a3296092c6ba5955ba64b.tar.gz |
conflicted.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/time.rb')
0 files changed, 0 insertions, 0 deletions