Make script executable

2024-11-19 17:06:35 +08:00
parent f3ddccf41e
commit 4a76969071
1 changed files with 0 additions and 4 deletions
--- a/docker/start-frontend.sh
+++ b/docker/start-frontend.sh
@@ -5,11 +5,7 @@ git pull
 pnpm build
 cd ../be.wfc/docker/
 ./copy.sh
-<<<<<<< HEAD
-sudo ./deploy.sh backend
-=======
 sudo docker stop wfc-nginx
 sudo docker rm wfc-nginx
 sudo docker rmi nginx
 sudo ./deploy.sh frontend
->>>>>>> fc0169ca987f34d6adf6016e96461d3109bd288b