resolve conflict

qiskit-community · Dec 14, 2024 · 265a963 · 265a963
1 parent cdc20eb
commit 265a963
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -16,12 +16,8 @@ pull_request_rules:
     actions:
       backport:
         branches:
-<<<<<<< HEAD
-          - stable/0.5
-=======
           - stable/0.6
   - name: automatic merge on CI success and review
     conditions: []
     actions:
       queue:
->>>>>>> 3162fef (ci(mergify): upgrade configuration to current format (#647))