From f8a7dfead367d8f30a63ac293e76f2920b2e57de Mon Sep 17 00:00:00 2001 From: Wouter Vanden Hove Date: Sat, 14 Oct 2023 14:25:19 +0200 Subject: [PATCH] update --- .github/workflows/dependabot-auto-merge.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml index 9e58ada..4d49f5d 100644 --- 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