From 390a12cf4c731eae799518f262ed02ddac96e2ac Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 13 Mar 2001 06:01:45 +0000
Subject: [PATCH] garvage is included.

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

diff --git a/ChangeLog b/ChangeLog
index c6780ae2fb..6d22b1346c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,6 @@ Tue Mar 13 14:54:39 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
 	* lib/net/protocol.rb: WriteAdapter#<< returns self.
 
-<<<<<<< ChangeLog
 Tue Mar 13 14:41:16 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (argf_seek_m): wrong calling sequence of rb_io_seek().