From 32bc91d5155fd71f757f08e19cf5cc79e6cd8bbf Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 18 Aug 2015 13:45:33 -0700 Subject: remove bad merge conflict resolution --- lib/chef/resource/service.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/chef/resource/service.rb b/lib/chef/resource/service.rb index e65f1bf724..1485a10eb1 100644 --- a/lib/chef/resource/service.rb +++ b/lib/chef/resource/service.rb @@ -45,7 +45,6 @@ class Chef @priority = nil @timeout = nil @run_levels = nil - @action = "nothing" @supports = { :restart => false, :reload => false, :status => false } end -- cgit v1.2.1