Generated Ansible files

buluma · Dec 26, 2023 · c2ce1d3 · c2ce1d3
2 parents fda78de + 97abffb
commit c2ce1d3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml
@@ -16,5 +16,10 @@ jobs:
         # uses: buluma/[email protected]  # TODO: rebuild action
         uses: robertdebock/[email protected]
         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
+>>>>>>> 97abffb84dff756706cfbd3f04dff00d7a8b7f05