summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 38895c3516..2334fcee4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,7 +62,6 @@ Mon Dec 27 14:36:20 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* process.c (NUM2RLIM, RLIM2NUM): Without SIZEOF_RLIM_T is not error.
fixed: [ruby-dev:25346]
->>>>>>> 1.3892
Sun Dec 26 16:21:39 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (Net::IMAP::PlainAuthenticator): added a new class