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 | 02401aac27956870b536694aac4106de58f156f8 (patch) | |
| tree | abad2b356a739b76e076cf7e1acdee58e4b01a16 /lib/resolv.rb | |
| parent | 01ceb2ee22ecc7a066880f29239e851b2d1398f3 (diff) | |
| download | ruby-02401aac27956870b536694aac4106de58f156f8.tar.gz ruby-02401aac27956870b536694aac4106de58f156f8.tar.xz ruby-02401aac27956870b536694aac4106de58f156f8.zip | |
conflicted.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/resolv.rb')
0 files changed, 0 insertions, 0 deletions