lib/relish/options_file.rb in relish-0.1.0 vs lib/relish/options_file.rb in relish-0.1.1

- old
+ new

@@ -26,9 +26,13 @@ def == (other) options == other end + def merge(other) + options.merge(other.options) + end + # Stored options as a hash def options @options ||= current_options end \ No newline at end of file