diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml index 51fcb24..f2227f6 100644 --- a/.github/workflows/galaxy.yml +++ b/.github/workflows/galaxy.yml @@ -16,5 +16,10 @@ jobs: # uses: buluma/galaxy-action@v6.25.22 # TODO: rebuild action uses: robertdebock/galaxy-action@1.2.1 with: +<<<<<<< HEAD galaxy_api_key: ${{ secrets.galaxy_api_key }} git_branch: ${{ github.event.repository.default_branch }} +======= + galaxy_api_key: ${{ secrets.galaxy_api_key }} + git_branch: main +>>>>>>> 70e7f55841811093e19a2fe391ad7b9153b66bbc