From b7b331dd28ff0fb9763c20c8cc65c0c69cf460c8 Mon Sep 17 00:00:00 2001 From: "jakob.stendahl" Date: Sun, 15 Jan 2023 22:48:27 +0100 Subject: Fix error in deploy script --- deploy.sh | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index 9b8ab74..bb3f79b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -53,7 +53,6 @@ git add . git commit -m ":rocket: Deploy app v$VERSION" tput setaf 4 -<<<<<<< Updated upstream echo "> Return to main branch and tag last commit" tput sgr0 @@ -62,15 +61,5 @@ git checkout main #git tag "v$VERSION" git push -f origin main -======= -echo "> Return to main branch and tag last commit" -tput sgr0 - -git checkout main - -#git tag "v$VERSION" - -git push -f origin main ->>>>>>> Stashed changes #git push origin "v$VERSION" git push origin gh-pages -- cgit v1.2.3