From c3d8ff4e84f650ad96e9944f4abebfafc99c6211 Mon Sep 17 00:00:00 2001 From: knu Date: Fri, 5 Aug 2011 08:28:00 +0000 Subject: Fix a possible merge error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b1e28e87a..0a5b89dce9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,10 +44,6 @@ Fri Aug 05 09:48:22 2011 Eric Hodel 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 - - Fri Aug 5 07:00:31 2011 Nobuyoshi Nakada * test/io/console/test_io_console.rb (test_noctty): daemon() on -- cgit v1.2.3