summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-05 08:28:00 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-05 08:28:00 +0000
commitc3d8ff4e84f650ad96e9944f4abebfafc99c6211 (patch)
tree59710b80026df9f6f025c5f0cb01fbee63026b33
parent39eea54cfe59d69282271e75703fd053b377a2f0 (diff)
Fix a possible merge error.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
1 files changed, 0 insertions, 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 <drbrain@segment7.net>
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@ruby-lang.org>
-
-
Fri Aug 5 07:00:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/io/console/test_io_console.rb (test_noctty): daemon() on