From b14fb1d8521f82329dcbbe05e92707bbb24f7919 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Tue, 12 Nov 2019 07:48:20 +0000
Subject: [PATCH] Close branch bugfix/merge_with_conflict