fix broken rebase

2023-09-14 14:55:01 +02:00
parent eaed13f9a2
commit 10bd082e51
1 changed files with 0 additions and 1 deletions
--- 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"/*