CaROS/caros
3
2
Fork 0
Code Issues Pull Requests 1 Packages Projects 1 Releases Wiki Activity

fix broken rebase

Browse Source
This commit is contained in:
Lars Niesen
2023-09-14 14:55:01 +02:00
parent 89b5d419b9
commit 6f50044117
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev/bootstrap.sh
View File

@@ -56,7 +56,6 @@ if $DO_SSTATE ; then
fi fi
if $DO_DEPLOY ; then if $DO_DEPLOY ; then
<<<<<<< HEAD
DEPLOY_PATH="deploy" DEPLOY_PATH="deploy"
mkdir -p $DEPLOY_PATH mkdir -p $DEPLOY_PATH
rm -rf "$DEPLOY_PATH"/* rm -rf "$DEPLOY_PATH"/*