diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-01-27 12:27:12 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-01-27 12:27:12 -0800 |
| commit | f48b141399260f787c77efa67ef4f558a89b7545 (patch) | |
| tree | 95c03ae954b71cf664527b7cea8bcd92564c2833 | |
| parent | 9bfff4c5c2e3ae38f6322e0d50d278388aadc0f2 (diff) | |
| download | chef-f48b141399260f787c77efa67ef4f558a89b7545.tar.gz | |
fix rebase confict error
| -rw-r--r-- | lib/chef/resource.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index 776d1f5440..3e9d119cee 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -651,7 +651,6 @@ class Chef include Chef::Mixin::ParamsValidate include Chef::Mixin::Deprecation -<<<<<<< HEAD # # The provider class for this resource. # @@ -670,13 +669,6 @@ class Chef arg end set_or_return(:provider, klass, kind_of: [ Class ]) -======= - extend Chef::Mixin::ConvertToClassName - extend Chef::Mixin::DescendantsTracker - - def self.strict_const_defined?(const) - const_defined?(const, false) ->>>>>>> Resource: use #const_defined? with arity 2 (ruby < 2 specific, issues #2497, #2503) end def provider=(arg) provider(arg) |