fix: backport conflcts

earthians · May 12, 2024 · a717ef1 · a717ef1
1 parent a4018eb
commit a717ef1
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -2,14 +2,6 @@ pull_request_rules:
   - name: Auto-close PRs on stable branch
     conditions:
       - and:
-<<<<<<< HEAD
-        - and:
-          - author!=akashkrishna619
-          - author!=akurungadam
-          - author!=frappe-pr-bot
-          - author!=mergify[bot]
-          - base=version-14
-=======
         - author!=Sajinsr
         - author!=akashkrishna619
         - author!=akurungadam
@@ -20,7 +12,6 @@ pull_request_rules:
         - base=version-16
         - base=version-15
         - base=version-14
->>>>>>> d23da9e (chore: update code owners)
     actions:
       close:
       comment: