diff options
| author | Matt Wrock <matt@mattwrock.com> | 2016-08-28 08:39:40 -0700 |
|---|---|---|
| committer | Matt Wrock <matt@mattwrock.com> | 2016-08-28 08:39:40 -0700 |
| commit | 49aab201034acb36f5f0a1bc5f0d9ea7d33d66cc (patch) | |
| tree | 5058f57787cd1e0c1d83f519b6f1575b59b563cf | |
| parent | 2ece9ef301eaf3b4751c1c05bdbf5c82730402c8 (diff) | |
| download | chef-49aab201034acb36f5f0a1bc5f0d9ea7d33d66cc.tar.gz | |
update gemfile.lock
| -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 b3e8711df6..aa5afc407e 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -8,7 +8,11 @@ GIT GIT remote: git://github.com/chef/omnibus-software.git +<<<<<<< HEAD + revision: cfaa501e4a6ac176171bb3008c672d963a4f832a +======= revision: 676b89e48a213f34567f847c1c2aa20f08d5a2b7 +>>>>>>> 2ece9ef301eaf3b4751c1c05bdbf5c82730402c8 branch: nano specs: omnibus-software (4.0.0) |