summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-06 00:56:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-06 00:56:06 +0000
commit8483e9bd58620460b261a2c47ede8237ab219651 (patch)
tree5a2ccd0d2fb93d2f35e6d0de8548c000404fb15d /ChangeLog
parentc3fcd1b871596e31d5f5c5f4274db8e637d2cd96 (diff)
* ChangeLog: remove duplicated entry due to git-svn conflict.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 0 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f9143b6d1..4e843ad23c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,11 +3,6 @@ Sat Apr 6 09:54:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (NATINT_LEN): fix definition order, must be after
NATINT_PACK.
-Sat Apr 6 09:47:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (NATINT_LEN): fix definition order, must be after
- NATINT_PACK.
-
Sat Apr 6 03:11:07 2013 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/yaml_tree.rb: fix symbol keys in coder