summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-27 04:14:47 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-27 04:14:47 +0000
commitabfb5cca430d7ca45c24ae195b95496ef7eb5344 (patch)
treef49a80aae4618284794bf413ad8092776f41d7e8
parente33e3ed2c663e655dd1bc4cb3f87f1dbf404ab22 (diff)
remove garbage
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
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}.