knu	2011-08-05 17:28:00 +0900 (Fri, 05 Aug 2011)

  New Revision: 32860

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

  Log:
    Fix a possible merge error.

  Modified files:
    trunk/ChangeLog

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32859)
+++ ChangeLog	(revision 32860)
@@ -44,10 +44,6 @@
 	  Gem repository directories are no longer created world-writable.
 	  Patch by Sakuro OZAWA.  [Ruby 1.9 - Bug #4930]
 
-
-Fri Aug  5 09:48:00 2011  Nobuyoshi Nakada  <nobu@r...>
-
-
 Fri Aug  5 07:00:31 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/io/console/test_io_console.rb (test_noctty): daemon() on

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