diff options
| author | John McCrae <jmccrae@chef.io> | 2021-04-13 15:08:29 -0700 |
|---|---|---|
| committer | John McCrae <jmccrae@chef.io> | 2021-04-13 15:08:29 -0700 |
| commit | 928158ffa78fdf5f44d080b982720b79d72b2909 (patch) | |
| tree | f9ff160f839885d2869f3fe4dc3379324b2924af | |
| parent | e6b3a4cea1b19ab5b8cf162dec13c21009e00e1e (diff) | |
| download | chef-928158ffa78fdf5f44d080b982720b79d72b2909.tar.gz | |
correcting the corrected correction in the refactored gemfile.lock
Signed-off-by: John McCrae <jmccrae@chef.io>
| -rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c137faa446..128e4c4af9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -207,11 +207,7 @@ GEM highline (2.0.3) httpclient (2.8.3) iniparse (1.5.0) -<<<<<<< HEAD inspec-core (4.31.1) -======= - inspec-core (4.29.3) ->>>>>>> ee0114abeba034d57630f2ac555fd480b733a9e0 addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0, < 1.4) @@ -234,13 +230,8 @@ GEM train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) -<<<<<<< HEAD inspec-core-bin (4.31.1) inspec-core (= 4.31.1) -======= - inspec-core-bin (4.29.3) - inspec-core (= 4.29.3) ->>>>>>> ee0114abeba034d57630f2ac555fd480b733a9e0 ipaddress (0.8.3) iso8601 (0.13.0) json (2.5.1) @@ -349,11 +340,7 @@ GEM syslog-logger (1.6.8) thor (1.1.0) tomlrb (1.3.0) -<<<<<<< HEAD train-core (3.6.0) -======= - train-core (3.5.5) ->>>>>>> ee0114abeba034d57630f2ac555fd480b733a9e0 addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) |