diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-08-18 13:45:33 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-08-18 13:45:33 -0700 |
| commit | 32bc91d5155fd71f757f08e19cf5cc79e6cd8bbf (patch) | |
| tree | 70b3532fa85e5bc3e04c7048036c4afd952caac0 | |
| parent | cacd802b3a3a3a2214cdd0783242a93835537b55 (diff) | |
| download | chef-32bc91d5155fd71f757f08e19cf5cc79e6cd8bbf.tar.gz | |
remove bad merge conflict resolution
| -rw-r--r-- | lib/chef/resource/service.rb | 1 |
1 files changed, 0 insertions, 1 deletions
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 |