diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-23 01:08:53 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-23 01:08:53 +0530 |
| commit | 1a18198af042031979549b8a5679950f9354caed (patch) | |
| tree | d57b051b6c8e6480f0fa6a4f440d625574cefca6 /activesupport/lib | |
| parent | 16dbe1db1eb0ebf6111d9938b88d1f0652b78734 (diff) | |
| download | rails-1a18198af042031979549b8a5679950f9354caed.tar.gz rails-1a18198af042031979549b8a5679950f9354caed.tar.bz2 rails-1a18198af042031979549b8a5679950f9354caed.zip | |
remove conflict marker
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/enumerable.rb | 1 |
1 files changed, 0 insertions, 1 deletions
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: # |