summaryrefslogtreecommitdiffstats
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
commit383899ffa264f3503248ebc924c358643344b4cf (patch)
treef49a80aae4618284794bf413ad8092776f41d7e8
parent77f483e3ffc0711c90f793ecefb376939d1e595b (diff)
downloadruby-383899ffa264f3503248ebc924c358643344b4cf.tar.gz
ruby-383899ffa264f3503248ebc924c358643344b4cf.tar.xz
ruby-383899ffa264f3503248ebc924c358643344b4cf.zip
remove garbage
git-svn-id: http://svn.ruby-lang.org/repos/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 d70eee806..07c9cc079 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}.