Skip to content
This repository
Browse code

Avoid unintended mergeception.

  • Loading branch information...
commit 95e41bf8c38e70a556d713e7104a945ac62e0893 1 parent 354f67f
Gonçalo Silva authored March 05, 2012

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. 2  lib/showoff_utils.rb
2  lib/showoff_utils.rb
@@ -320,7 +320,7 @@ def self.get_config_option(dir, option, default = nil)
320 320
       data = JSON.parse(File.read(index))
321 321
       if data.is_a?(Hash)
322 322
         if default.is_a?(Hash)
323  
-          default.merge(data[option] || default)
  323
+          default.merge(data[option] || {})
324 324
         else
325 325
           data[option] || default
326 326
         end

0 notes on commit 95e41bf

Please sign in to comment.
Something went wrong with that request. Please try again.