Skip to content
Snippets Groups Projects
Commit e9740356 authored by Mathieu Sauve-Frankel's avatar Mathieu Sauve-Frankel
Browse files

we actually want merge!

parent 699a6ef9
No related branches found
Tags v0.1.2
No related merge requests found
......@@ -25,7 +25,7 @@ class MailHandler < Chef::Handler
:to_address => "root",
:template_path => File.join(File.dirname(__FILE__), "mail.erb")
}
options.merge opts
@options.merge! opts
end
def report
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment