Merge branch 'main' of https://github.com/kusterjs/CCAMS-server

kusterjs · Nov 23, 2024 · 2a5bf80 · 2a5bf80
2 parents d09e1d8 + d6287a7
commit 2a5bf80
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -24,4 +24,8 @@ jobs:
 
     - name: Deploy code to server
       run: |
+<<<<<<< HEAD
         ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} "cd ${DEPLOY_PATH:-TEST} && git pull origin main"
+=======
+        ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} "cd ${DEPLOY_PATH:-/TEST} && git pull origin main"
+>>>>>>> d6287a7ed8cd7fcbcc7dac55e29a9ac7a619e8e0