summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/mergify.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml
index 985cf0981..8733cfcad 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -7,4 +7,4 @@ pull_request_rules:
actions:
label:
toggle:
- - conflict
+ - conflicts