remove garbage

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-05-27 04:14:47 +00:00 · 2008-05-27 04:14:47 +00:00 · abfb5cca43
--- a/1
+++ b/1
@ -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}.