nobu	2015-10-26 16:05:22 +0900 (Mon, 26 Oct 2015)

  New Revision: 52283

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52283

  Log:
    fix commit miss [ci skip]
    
    * ChangeLog: remove duplicated entry, caused by a conflict.

  Modified files:
    trunk/ChangeLog
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52282)
+++ ChangeLog	(revision 52283)
@@ -3,11 +3,6 @@ Mon Oct 26 12:55:06 2015  Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ChangeLog#L3
 	* 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@r...>
-
-	* 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@g...>
 
 	* thread_pthread.c: fix compile erros when

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/