From e7d7d194906c2d99280c9643e409aab5eed36d12 Mon Sep 17 00:00:00 2001 From: Joel Male Date: Thu, 17 Sep 2020 18:47:31 +1000 Subject: [PATCH] Fixes invalid mergify config --- .github/mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 50839b02..81b54823 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -3,7 +3,7 @@ pull_request_rules: conditions: - base=develop - label=dependencies - - conflict=false + - -conflict actions: merge: method: merge \ No newline at end of file