diff options
| author | John McCrae <jmccrae@chef.io> | 2021-04-20 12:29:35 -0700 |
|---|---|---|
| committer | John McCrae <jmccrae@chef.io> | 2021-04-20 12:29:35 -0700 |
| commit | 6d5562a21171d86e449c9145223d0b964945ff7c (patch) | |
| tree | 1a50a4671d75a6d51928bcc54e00aa3f5baa9198 | |
| parent | 1326490849e85e29dff5b091ecf4fde6a5e866dc (diff) | |
| parent | 2f1c7ec9479ff618144a7539f60bac07dcb6e58a (diff) | |
| download | chef-6d5562a21171d86e449c9145223d0b964945ff7c.tar.gz | |
moving slightly forward
Signed-off-by: John McCrae <jmccrae@chef.io>
| -rw-r--r-- | omnibus/Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 78e29375ed..05d6c23901 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,11 @@ GIT GIT remote: https://github.com/chef/omnibus-software +<<<<<<< HEAD revision: 810a6c469aefab77a577e222317e796159ee81ca +======= + revision: 8d91dc6a566aba77c864678680d4142561b2f655 +>>>>>>> 2f1c7ec9479ff618144a7539f60bac07dcb6e58a branch: master specs: omnibus-software (4.0.0) |