diff options
author | Xavier Noria <fxn@hashref.com> | 2011-03-06 20:34:56 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-03-06 20:34:56 +0100 |
commit | 3a621e7be4d5f592e04e8ee03435936f9e5f1c36 (patch) | |
tree | 894abbc4e3047104b3d84c0ea11eed670db58c5d /activesupport/lib/active_support/core_ext/object | |
parent | 89d825d02172f7c1ba1211119ea9844206aae9c3 (diff) | |
download | rails-3a621e7be4d5f592e04e8ee03435936f9e5f1c36.tar.gz rails-3a621e7be4d5f592e04e8ee03435936f9e5f1c36.tar.bz2 rails-3a621e7be4d5f592e04e8ee03435936f9e5f1c36.zip |
removes merge conflicts
Diffstat (limited to 'activesupport/lib/active_support/core_ext/object')
-rw-r--r-- | activesupport/lib/active_support/core_ext/object/blank.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb index 7b5832b51a..d0c1ea8326 100644 --- a/activesupport/lib/active_support/core_ext/object/blank.rb +++ b/activesupport/lib/active_support/core_ext/object/blank.rb @@ -13,11 +13,7 @@ class Object respond_to?(:empty?) ? empty? : !self end -<<<<<<< HEAD - # An object is present if it's not #blank?. -======= # An object is present if it's not <tt>blank?</tt>. ->>>>>>> 20768176292cbcb883ab152b4aa9ed8c664771cd def present? !blank? end |