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

@@ -1,7 +1,6 @@
 require 'confrider/version'
-# 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/vault'
 require 'confrider/core'
 
 module Confrider
   def self.from_hash(hash)
     Confrider::Core.new.tap do |o|