update

libranet · Oct 14, 2023 · f8a7dfe · f8a7dfe
1 parent 6de6263
commit f8a7dfe
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml
@@ -8,11 +8,7 @@ jobs:
   auto-merge:
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
-      - uses: actions/checkout@v3
-=======
       - uses: actions/checkout@v4
->>>>>>> 5a84c39 (update)
       - uses: ahmadnassri/action-dependabot-auto-merge@v2
         with:
           target: minor