diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 15:07:30 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 15:07:30 -0800 |
| commit | a2776adb489a952e728f08ed80cebf5be493c0bf (patch) | |
| tree | 8927e80e2e196d73cc3da0f1523f29ca7c07205d /lib/chef/mixin | |
| parent | 0507c08bc75bde24c3e4f32878a2d0ab6b2db591 (diff) | |
| download | chef-a2776adb489a952e728f08ed80cebf5be493c0bf.tar.gz | |
remove InvalidSubtractiveMerge class
Diffstat (limited to 'lib/chef/mixin')
| -rw-r--r-- | lib/chef/mixin/deep_merge.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/chef/mixin/deep_merge.rb b/lib/chef/mixin/deep_merge.rb index 58b6f18b07..c19f2a1a7d 100644 --- a/lib/chef/mixin/deep_merge.rb +++ b/lib/chef/mixin/deep_merge.rb @@ -27,8 +27,6 @@ class Chef # http://trac.misuse.org/science/wiki/DeepMerge module DeepMerge - class InvalidSubtractiveMerge < ArgumentError; end - extend self def merge(first, second) |