From eaed13f9a2bc9b1f97339df80b50e96ae26787a4 Mon Sep 17 00:00:00 2001
From: Lars Niesen <lars.niesen@gmx.de>
Date: Wed, 12 Jul 2023 18:27:59 +0200
Subject: [PATCH] Implement basic yocto build setup based on protos from
 jhnc-oss

---
 dev/bootstrap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh
index 2af38bb..765c218 100755
--- a/dev/bootstrap.sh
+++ b/dev/bootstrap.sh
@@ -56,6 +56,7 @@ if $DO_SSTATE ; then
 fi
 
 if $DO_DEPLOY ; then
+<<<<<<< HEAD
     DEPLOY_PATH="deploy"
     mkdir -p $DEPLOY_PATH
     rm -rf "$DEPLOY_PATH"/*