From 6f500441178acec597863d4244dd25b5a5206f37 Mon Sep 17 00:00:00 2001
From: Lars Niesen <lars.niesen@gmx.de>
Date: Thu, 14 Sep 2023 14:55:01 +0200
Subject: [PATCH] fix broken rebase

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

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