From 8807c8f7b31d549d22e5050e34cd7b345c645824 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 11 Dec 2018 09:00:26 +0000
Subject: [PATCH] Close branch feature/merge_conflictResolution