From fe2ac6b3f96472f2053798f21f9f47b4a33c31ac Mon Sep 17 00:00:00 2001 From: Jason Ernst Date: Wed, 20 Mar 2024 15:45:25 -0700 Subject: [PATCH] fix bad merge --- .github/workflows/deploy.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a3f23d5..a846234 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,7 +12,6 @@ jobs: runs-on: ubuntu-latest steps: -<<<<<<< HEAD - name: 'Checkout git repo' uses: actions/checkout@v4 with: @@ -20,10 +19,5 @@ jobs: 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 }} \ No newline at end of file + uses: ansible-actions/ansible-galaxy-action@v1.2.0: + galaxy_api_key: ${{ secrets.galaxy_api_key } \ No newline at end of file