fix bad merge

compscidr · Mar 20, 2024 · fe2ac6b · fe2ac6b
1 parent 1c1f228
commit fe2ac6b
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -12,18 +12,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-<<<<<<< HEAD
       - name: 'Checkout git repo'
         uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
 
       - 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 }}
+        uses: ansible-actions/ansible-galaxy-action@v1.2.0:
+          galaxy_api_key: ${{ secrets.galaxy_api_key }