From 24a34f075c4a6173f8cfddd09d7406f23b6a3a68 Mon Sep 17 00:00:00 2001 From: Mike Dodge Date: Tue, 19 Jan 2016 14:15:20 -0800 Subject: fixed rebase --- lib/chef/provider/launchd.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/chef/provider/launchd.rb') diff --git a/lib/chef/provider/launchd.rb b/lib/chef/provider/launchd.rb index 38304355c7..7a444dbe38 100644 --- a/lib/chef/provider/launchd.rb +++ b/lib/chef/provider/launchd.rb @@ -72,7 +72,7 @@ class Chef def manage_plist(action) if @source res = cookbook_file_resource - elsif + else res = file_resource end res.run_action(action) -- cgit v1.2.1