resolve github same ref issue

MingInc · Nov 15, 2024 · d53eff8 · d53eff8
1 parent da7020d
commit d53eff8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/backend/scripts/deploy/ViteReact.sh b/backend/scripts/deploy/ViteReact.sh
@@ -4,10 +4,6 @@
 PROJECT_NAME=$1
 GIT_URL=$2
 PROJECT_FOLDER_NAME=$3
-<<<<<<< HEAD
-NGROK_AUTH_TOKEN=$4  # Optional: If you want to use ngrok instead of Serveo
-=======
->>>>>>> 353202c8e23afbe17d4747ae8eacd70ec7e2e170
 
 # Function to clean up Docker container and image
 cleanup() {