From 33d86ddebe878d355d0fc3fe78d9ecee5e1ae633 Mon Sep 17 00:00:00 2001
From: Neil Gerring <ng@neilgerring.co.uk>
Date: Fri, 13 May 2022 14:04:59 +0100
Subject: [PATCH] Fix a merge conflict in openstack.yml example

Signed-off-by: Neil Gerring <ng@neilgerring.co.uk>
---
 examples/openstack.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/openstack.yml b/examples/openstack.yml
index 0d5bbbc59..15efe0660 100644
--- a/examples/openstack.yml
+++ b/examples/openstack.yml
@@ -2,11 +2,7 @@ kernel:
   image: linuxkit/kernel:5.10.92
   cmdline: "console=ttyS0"
 init:
-<<<<<<< HEAD
   - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7
-=======
-  - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7
->>>>>>> 01725ea17 (update dependencies of pkg/init and pkg/containerd)
   - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4
   - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da
   - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4