From 4a76969071f40394d6e965850c870a2421e736e6 Mon Sep 17 00:00:00 2001
From: wfc <wfc@wfc.com>
Date: Tue, 19 Nov 2024 17:06:35 +0800
Subject: [PATCH] Make script executable

---
 docker/start-frontend.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker/start-frontend.sh b/docker/start-frontend.sh
index 24f06d6..300a715 100755
--- 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