diff options
| author | John <john.mccrae@progress.com> | 2023-02-27 15:35:39 -0800 |
|---|---|---|
| committer | John <john.mccrae@progress.com> | 2023-02-28 15:43:40 -0800 |
| commit | b4e5f9b00cfb7c1aee75e598f09fa15103ca91e9 (patch) | |
| tree | 12d45f864b7c29d0ca9998b031aec146b759b633 | |
| parent | 2f5d0736a05763882b8a8a23bb08bb6c9e624cc2 (diff) | |
| download | chef-b4e5f9b00cfb7c1aee75e598f09fa15103ca91e9.tar.gz | |
correcting for gem errors
Signed-off-by: John <john.mccrae@progress.com>
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1e7ed7b77c..363cb830b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,11 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) +<<<<<<< HEAD aws-partitions (1.718.0) +======= + aws-partitions (1.717.0) +>>>>>>> bcdf411f45 (correcting for gem errors) aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -165,7 +169,11 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.4) byebug (11.1.3) +<<<<<<< HEAD chef-powershell (1.0.19) +======= + chef-powershell (1.0.17) +>>>>>>> bcdf411f45 (correcting for gem errors) ffi (~> 1.15) ffi-yajl (~> 2.4) chef-telemetry (1.1.1) @@ -290,7 +298,11 @@ GEM multipart-post (2.3.0) net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) +<<<<<<< HEAD net-sftp (4.0.0) +======= + net-sftp (4.0.0.rc1) +>>>>>>> bcdf411f45 (correcting for gem errors) net-ssh (>= 5.0.0, < 8.0.0) net-ssh (7.0.1) nori (2.6.0) |