lib/confrider.rb in confrider-0.0.2 vs lib/confrider.rb in confrider-0.1.0

@@ -1,6 +1,7 @@
 require 'confrider/version'
-require 'confrider/deep_merge'
+# don't load confrider/deep_merge if it was already loaded from active_support
+require 'confrider/deep_merge' unless {}.respond_to? :deep_merge
 require 'confrider/core'
 
 module Confrider
   def self.from_hash(hash)
     Confrider::Core.new.tap do |o|