ci: drop "conflicts" section from mergify

mrmlnc · Mar 22, 2020 · 8061095 · 8061095
1 parent f22688e
commit 8061095
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,11 +1,4 @@
 pull_request_rules:
-  - name: Conflicts
-    conditions:
-      - conflict
-    actions:
-      comment:
-        message: This pull request is now in conflicts. Could you fix it?
-
   - name: Merge with review
     conditions:
       - base=master