Merge pull request #14 from deigil/dei

workflow fixes
deigil · Apr 16, 2024 · 523fbd2 · 523fbd2
2 parents 8d56218 + 12dacfc
commit 523fbd2
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -1,7 +1,7 @@
 name: Deploy
 
 on:
-  push:
+  merge:
     branches:
       - main
 
@@ -20,7 +20,4 @@ jobs:
           username: ${{ secrets.USERNAME }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           stop_script: cd /home/ubuntu/djangobackend && ./checks.sh
-<<<<<<< HEAD
-=======
-
->>>>>>> 9009f25d3f4c79f0d5f5a2f96798a07c213ccda1
+