backport fix

skip-mev · Sep 11, 2023 · 2ce5e4c · 2ce5e4c
1 parent 888f172
commit 2ce5e4c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,8 +15,6 @@ updates:
     labels:
       - "A:automerge"
       - dependencies
-<<<<<<< HEAD
-=======
     open-pull-requests-limit: 5
     target-branch: "main"
 
@@ -39,4 +37,3 @@ updates:
       - dependencies
     open-pull-requests-limit: 5
     target-branch: "release/v2.x.x"
->>>>>>> 34d8adf (init (#67))