diff options
author | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
---|---|---|
committer | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
commit | 091001ae8d27a8a5de03af2c20905e23a8ffefb7 (patch) | |
tree | 28abfa5821f80e2090b8f89988a0bab004b710a5 /lib/chef/monkey_patches/object.rb | |
parent | 8a7b450cb87ef62e9f21d32c91a52accefba6ffd (diff) | |
parent | a45716b67a2168c21b166e4aab38668e9b96d856 (diff) | |
download | chef-merging-master.tar.gz |
Merge branch 'master' into merging-mastermerging-master
Conflicts:
lib/chef/version.rb
Diffstat (limited to 'lib/chef/monkey_patches/object.rb')
-rw-r--r-- | lib/chef/monkey_patches/object.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/chef/monkey_patches/object.rb b/lib/chef/monkey_patches/object.rb deleted file mode 100644 index 017a4b7938..0000000000 --- a/lib/chef/monkey_patches/object.rb +++ /dev/null @@ -1,9 +0,0 @@ -class Object - unless new.respond_to?(:tap) - def tap - yield self - return self - end - end -end - |