From 0730057b53f04946d8ac437a9cc67bcd69229e5f Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 29 Dec 2004 14:38:32 +0000
Subject: * ChangeLog: remove junk.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ChangeLog')

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
-- 
cgit v1.2.3