ko1	2007-08-28 01:52:23 +0900 (Tue, 28 Aug 2007)

  New Revision: 13291

  Modified files:
    trunk/ChangeLog

  Log:
    remove conflict sign.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13291&r2=13290

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13290)
+++ ChangeLog	(revision 13291)
@@ -54,7 +54,6 @@
 
 	* string.c (sym_encoding): return the encoding of a Symbol.
 
->>>>>>> .r13289
 Mon Aug 27 15:33:10 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* util.c (IEEE_BIG_ENDIAN): use configured value.  [ruby-dev:31623]

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