glass	2015-05-10 11:19:55 +0900 (Sun, 10 May 2015)

  New Revision: 50456

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

  Log:
    Revert "temp".
    It's my fault.

  Modified files:
    trunk/enum.c
Index: enum.c
===================================================================
--- enum.c	(revision 50455)
+++ enum.c	(revision 50456)
@@ -515,18 +515,7 @@ enum_flat_map(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L515
 static VALUE
 enum_to_a(int argc, VALUE *argv, VALUE obj)
 {
-<<<<<<< HEAD
-    VALUE ary, size = rb_check_funcall(obj, id_size, 0, 0);
-
-    if (size == Qundef) {
-	ary = rb_ary_new();
-    }
-    else {
-	ary = rb_ary_new2(NUM2LONG(size));
-    }
-=======
     VALUE ary = rb_ary_new();
->>>>>>> parent of 3482910... temp
 
     rb_block_call(obj, id_each, argc, argv, collect_all, ary);
     OBJ_INFECT(ary, obj);

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