remove conflict marker

1a18198a · Vijay Dev · 16dbe1db · 1a18198a
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

activesupport/lib/active_support/core_ext/enumerable.rb activesupport/lib/active_support/core_ext/enumerable.rb +0 -1

未找到文件。
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -46,7 +46,6 @@ def each_with_object(memo)
    end
    memo
  end unless [].respond_to?(:each_with_object)
->>>>>>> parent of 4d20de8... Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH*

  # Convert an enumerable to a hash. Examples:
  #