kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 29 Pull Requests 3 Projects 2 Activity

Fix botched merge

Browse Source
This commit is contained in:
Greg Karékinian 2019-03-19 19:41:26 +01:00
parent ec58597320
commit 3047dbe99f
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Berksfile.lock
View File

@ -114,11 +114,7 @@ GRAPH
hostsfile (2.4.5) hostsfile (2.4.5)
iis (6.7.1) iis (6.7.1)
windows (>= 2.0) windows (>= 2.0)
<<<<<<< HEAD
ipfs (0.1.2) ipfs (0.1.2)
=======
ipfs (0.1.1)
>>>>>>> 591c746... Update the ipfs cookbook
ark (>= 0.0.0) ark (>= 0.0.0)
logrotate (2.2.0) logrotate (2.2.0)
mariadb (0.3.1) mariadb (0.3.1)