squash!

IntakeNomNom · Apr 28, 2024 · cec7ba3 · cec7ba3
1 parent c6c6920
commit cec7ba3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/Dependabot.yml b/.github/workflows/Dependabot.yml
@@ -20,11 +20,7 @@ jobs:
         if: ${{ github.actor == 'dependabot[bot]' }}
 
         steps:
-<<<<<<< HEAD
-            - uses: dependabot/[email protected]
-=======
             - uses: dependabot/[email protected]
->>>>>>> 95c4f19140b43eabe1ff9936f3865cb279813e8f
               with:
                   github-token: "${{ secrets.GITHUB_TOKEN }}"