lib/hammer_cli/settings.rb in hammer_cli-0.6.1 vs lib/hammer_cli/settings.rb in hammer_cli-0.7.0

- old
+ new

@@ -70,9 +70,11 @@ other_h = symbolize_hash(other_h) h.merge!(other_h) do |key, old_val, new_val| if old_val.is_a? Hash and new_val.is_a? Hash deep_merge!(old_val, new_val) + elsif old_val.is_a? Array and new_val.is_a? Array + old_val += new_val else new_val end end end