Merge con develop

Arquisoft · Apr 7, 2024 · 597fe01 · 597fe01
1 parent 1d8a5fa
commit 597fe01
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -163,6 +163,4 @@ jobs:
           wget https://raw.githubusercontent.com/arquisoft/wiq_es2b/master/docker-compose.yml -O docker-compose.yml
           wget https://raw.githubusercontent.com/arquisoft/wiq_es2b/master/.env -O .env
           docker compose --profile prod down
-          docker compose --profile prod up -d --pull always
-
->>>>>>>>> Temporary merge branch 2
+          docker compose --profile prod up -d --pull always