fix commit miss [ci skip]

* ChangeLog: remove duplicated entry, caused by a conflict. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
deivid-rodriguez · Oct 26, 2015 · 59093eb · 59093eb
1 parent 603b000
commit 59093eb
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -3,11 +3,6 @@ Mon Oct 26 12:55:06 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* parse.y (call_op2): separate from call_op and also allow "::",
 	  while dot_or_colon should not allow ".?".  [Feature #11537]
 
-Mon Oct 26 12:54:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (call_op2): separate from call_op and also allow "::",
-	  while dot_or_colon should not allow ".?".  [Feature #11537]
-
 Mon Oct 26 01:03:23 2015  Rei Odaira  <Rei.Odaira@gmail.com>
 
 	* thread_pthread.c: fix compile erros when