From a96437e54c60a16b27e2a3916ad96c420237d485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 31 Jul 2019 15:55:13 +0200 Subject: [PATCH] Github you're stupid No merge conflicts but you say: ``` This branch has conflicts that must be resolved ``` :tired_face: