From 8483e9bd58620460b261a2c47ede8237ab219651 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 6 Apr 2013 00:56:06 +0000
Subject: * 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
---
 ChangeLog | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'ChangeLog')

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
-- 
cgit v1.2.3