тралалеро

2025-05-26 16:40:36 -04:00 · 2025-05-26 16:40:36 -04:00 · 7897e53807
commit 7897e53807
parent 85a6cf5723
1 changed files with 0 additions and 4 deletions
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@ -26,10 +26,6 @@ jobs:
            cd ${{ secrets.PROJECT_PATH }} &&
            git pull origin main &&
            docker-compose down --remove-orphans &&
-<<<<<<< HEAD
            sleep 3 &&
-=======
-	        sleep 3 &&
->>>>>>> ebdc08a921273e8a46bcf5fcf9a727dc832aa7d3
            docker-compose up -d --build
          "