diff options
| author | Matt Wrock <matt@mattwrock.com> | 2016-08-28 08:40:46 -0700 |
|---|---|---|
| committer | Matt Wrock <matt@mattwrock.com> | 2016-08-28 08:40:46 -0700 |
| commit | bd5f44b7607896c3b38f8a89c90f9a033baa7b5a (patch) | |
| tree | 56ba73e93d18abf051bdf5bc0799d0b2cf180e92 | |
| parent | 49aab201034acb36f5f0a1bc5f0d9ea7d33d66cc (diff) | |
| download | chef-bd5f44b7607896c3b38f8a89c90f9a033baa7b5a.tar.gz | |
update gemfile.lock
| -rw-r--r-- | omnibus/Gemfile.lock | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index aa5afc407e..9cbc38d65e 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -8,11 +8,7 @@ GIT GIT remote: git://github.com/chef/omnibus-software.git -<<<<<<< HEAD revision: cfaa501e4a6ac176171bb3008c672d963a4f832a -======= - revision: 676b89e48a213f34567f847c1c2aa20f08d5a2b7 ->>>>>>> 2ece9ef301eaf3b4751c1c05bdbf5c82730402c8 branch: nano specs: omnibus-software (4.0.0) |