From 7fba712fd226785813b158cf20b98bcd91ecd72e Mon Sep 17 00:00:00 2001
From: Christian Kotzbauer <christian.kotzbauer@gmail.com>
Date: Sun, 8 Mar 2020 16:41:15 +0100
Subject: [PATCH] fix mergify config

---
 .mergify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index f89ec57..85f89cd 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -31,7 +31,7 @@ pull_request_rules:
 
   - name: ask to resolve conflict
     conditions:
-      - conflicts
+      - conflict
     actions:
         comment:
           message: This pull request has now conflicts with the base branch. Could you please try to fix them? 🙏