summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2025-10-10 21:06:33 +0200
committerGitHub <noreply@github.com>2025-10-10 21:06:33 +0200
commit4b18a02e2fa1723c7124d798030061a9683d051e (patch)
tree131507d30115b51c78ed0b38d644d726306b7b05
parent9baf8c83d1e680173386560c7116acf1bf49737a (diff)
parent3becc6e764d357f81de7b27d95b1d6da6ca2b6fe (diff)
downloadvyos-1x-4b18a02e2fa1723c7124d798030061a9683d051e.tar.gz
vyos-1x-4b18a02e2fa1723c7124d798030061a9683d051e.zip
Merge pull request #4785 from kumvijaya/current
T7878: Using mergify rule to handle conflict checks for private repo - updated label name
-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