From 3a621e7be4d5f592e04e8ee03435936f9e5f1c36 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sun, 6 Mar 2011 20:34:56 +0100 Subject: removes merge conflicts --- activesupport/lib/active_support/core_ext/object/blank.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'activesupport/lib/active_support/core_ext/object') 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 blank?. ->>>>>>> 20768176292cbcb883ab152b4aa9ed8c664771cd def present? !blank? end -- cgit v1.2.3