remove conflict marker

2011-12-23 01:08:53 +05:30 · 2011-12-23 01:08:53 +05:30 · 1a18198af0
commit 1a18198af0
parent 16dbe1db1e
1 changed files with 0 additions and 1 deletions
--- 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:
  #