From abfb5cca430d7ca45c24ae195b95496ef7eb5344 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 May 2008 04:14:47 +0000
Subject: [PATCH] remove garbage

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

diff --git a/ChangeLog b/ChangeLog
index d70eee806c..07c9cc0791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 Tue May 27 13:12:37 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* io.c (Init_IO): Define ARGF.{lines,bytes,chars}.