lib/confuse/config.rb in confuse-0.1.5 vs lib/confuse/config.rb in confuse-0.1.6

@@ -17,18 +17,15 @@
     end
 
     def initialize(options = {})
       load_namespaces(self.class.namespaces.clone)
       paths = options[:paths] || []
-      load_defaults = begin
-                        d = options[:load_defaults]
-                        d.nil? ? true : d
-                      end
       if paths.flatten.empty?
         read_files(self.class.config_path.flatten)
       else
         read_files(paths.flatten)
       end
+      options[:conf].tap { |conf| conf && mixin_config!(conf) }
     end
 
     def config
       self
     end