summaryrefslogtreecommitdiff
path: root/lib/time.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-12-18 09:37:34 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-12-18 09:37:34 +0000
commitab34f43ae82e6254086a3296092c6ba5955ba64b (patch)
treeabad2b356a739b76e076cf7e1acdee58e4b01a16 /lib/time.rb
parentb487727ea43de143996d0a802813bbf39ee2b043 (diff)
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