Permalink
Browse files

Avoid unintended mergeception.

  • Loading branch information...
1 parent 354f67f commit 95e41bf8c38e70a556d713e7104a945ac62e0893 @goncalossilva goncalossilva committed Mar 5, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/showoff_utils.rb
@@ -320,7 +320,7 @@ def self.get_config_option(dir, option, default = nil)
data = JSON.parse(File.read(index))
if data.is_a?(Hash)
if default.is_a?(Hash)
- default.merge(data[option] || default)
+ default.merge(data[option] || {})
else
data[option] || default
end

0 comments on commit 95e41bf

Please sign in to comment.