Permalink
Browse files

removes merge conflicts

  • Loading branch information...
1 parent 89d825d commit 3a621e7be4d5f592e04e8ee03435936f9e5f1c36 @fxn fxn committed Mar 6, 2011
View
11 activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
@@ -3,23 +3,12 @@ class Hash
#
# options = options.reverse_merge(:size => 25, :velocity => 10)
#
-<<<<<<< HEAD
- # The default <tt>:size</tt> and <tt>:velocity</tt> are only set if the +options+ hash passed in doesn't already
- # have the respective key.
- #
- # As contrast, using Ruby's built in <tt>merge</tt> would require writing the following:
- #
- # def setup(options = {})
- # options = { :size => 25, :velocity => 10 }.merge(options)
- # end
-=======
# is equivalent to
#
# options = {:size => 25, :velocity => 10}.merge(options)
#
# This is particularly useful for initializing an options hash
# with default values.
->>>>>>> 20768176292cbcb883ab152b4aa9ed8c664771cd
def reverse_merge(other_hash)
other_hash.merge(self)
end
View
4 activesupport/lib/active_support/core_ext/object/blank.rb
@@ -13,11 +13,7 @@ def blank?
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

0 comments on commit 3a621e7

Please sign in to comment.