From c4b980270d43b0e18501ce11ff3c591bcb7e0cfe Mon Sep 17 00:00:00 2001
From: Joel Male <joel@joelmale.com>
Date: Thu, 17 Sep 2020 16:45:30 +1000
Subject: [PATCH] Mergify: Merge on no conflicts

---
 .github/mergify.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index a3a9b1d3..50839b02 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -3,6 +3,7 @@ pull_request_rules:
     conditions:
       - base=develop
       - label=dependencies
+      - conflict=false
     actions:
       merge:
         method: merge
\ No newline at end of file