diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-03 16:25:28 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-03 16:25:28 -0800 |
| commit | cf45f8a20cad5672bbffa6073f4a0f6d2e6d0596 (patch) | |
| tree | 56beec20057cd91540c7f832aaf7ba847482e9cb | |
| parent | 5fd3c2f8376d7264d8ca4f883c9dfc4fbfb9b0d3 (diff) | |
| download | chef-lcg/better-chef-rspec-constraints.tar.gz | |
remove merge conflict resolution errorlcg/better-chef-rspec-constraints
| -rw-r--r-- | spec/support/platform_helpers.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index d54c6f20d2..9ba56a15e3 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -22,10 +22,6 @@ class DependencyProc < Proc end end -class ShellHelpers - extend Chef::Mixin::ShellOut -end - def ruby_64bit? !!(RbConfig::CONFIG["host_cpu"] =~ /x86_64/) end |