resolve conflicts to master

Studio-Yandex-Practicum · Oct 6, 2024 · 6a2cf0b · 6a2cf0b
2 parents 85c1c19 + 7ef3429
commit 6a2cf0b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/prod_deploy.yaml b/.github/workflows/prod_deploy.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-
 env:
     DEPLOY_PATH: adaptive_hockey_federation
     REGISTRY: ghcr.io
@@ -114,7 +113,6 @@ jobs:
         target: "${{ env.DEPLOY_PATH }}/infra"
         rm: true
         strip_components: 1
-
     - name: Execute commands on VPS
       uses: appleboy/ssh-action@master
       with:

diff --git a/.gitignore b/.gitignore
@@ -185,4 +185,4 @@ media/
 a_hockey-main/
 adaptive_hockey_federation/service/test_video/
 
-db_dump.json
+db_dump.json