github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3778 from NeilGerring/fix-bad-rebase

Browse Source 
Fix a merge conflict in openstack.yml example
This commit is contained in:
David Scott 2022-07-22 06:06:57 -07:00 committed by GitHub
commit 2bf3726a81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/openstack.yml
View File

@ -2,11 +2,7 @@ kernel:
image: linuxkit/kernel:5.10.104 image: linuxkit/kernel:5.10.104
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
<<<<<<< HEAD
- linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7
=======
- linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7
>>>>>>> 01725ea17 (update dependencies of pkg/init and pkg/containerd)
- linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4
- linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da
- linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4