From 1a18198af042031979549b8a5679950f9354caed Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Fri, 23 Dec 2011 01:08:53 +0530 Subject: remove conflict marker --- activesupport/lib/active_support/core_ext/enumerable.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb index c2e7cc80a1..004014948e 100644 --- a/activesupport/lib/active_support/core_ext/enumerable.rb +++ b/activesupport/lib/active_support/core_ext/enumerable.rb @@ -46,7 +46,6 @@ module Enumerable 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: # -- cgit v1.2.3