merge origin/main

compscidr · Mar 20, 2024 · 4ef2f4c · 4ef2f4c
2 parents f26a310 + 3f65eea
commit 4ef2f4c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -12,6 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+<<<<<<< HEAD
       - name: 'Checkout git repo'
         uses: actions/checkout@v4
         with:
@@ -20,5 +21,9 @@ jobs:
 
       - name: 'Release on galaxy'
         uses: ansible-actions/ansible-galaxy-action@v1.2.0
+=======
+      - name: galaxy
+        uses: robertdebock/galaxy-action@1.2.1
+>>>>>>> origin/main
         with:
           galaxy_api_key: ${{ secrets.galaxy_api_key }}