knu	2008-05-27 13:14:47 +0900 (Tue, 27 May 2008)

  New Revision: 16621

  Modified files:
    trunk/ChangeLog

  Log:
    remove garbage


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16621&r2=16620&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16620)
+++ ChangeLog	(revision 16621)
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 Tue May 27 13:12:37 2008  Akinori MUSHA  <knu@i...>
 
 	* io.c (Init_IO): Define ARGF.{lines,bytes,chars}.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/