nobu	2014-10-26 12:22:19 +0900 (Sun, 26 Oct 2014)

  New Revision: 48143

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48143

  Log:
    ChangeLog: remove conflict mark

  Modified files:
    trunk/ChangeLog
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48142)
+++ ChangeLog	(revision 48143)
@@ -16,7 +16,6 @@ Sat Oct 25 22:28:17 2014  Tanaka Akira https://github.com/ruby/ruby/blob/trunk/ChangeLog#L16
 
 	* io.c (io_binwrite_string): Test writev() failure.
 
->>>>>>> .r48141
 Sat Oct 25 20:19:19 2014  Martin Duerst <duerst@i...>
 
 	* test/test-unicode_normalize.rb: added test_us_ascii.

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