From 927882007f0f3f09eb6780b566800f55b8aab67a Mon Sep 17 00:00:00 2001
From: Elias Kuiter <info@elias-kuiter.de>
Date: Tue, 11 Jun 2019 14:35:09 +0200
Subject: [PATCH] v0.7.2

Transitions for clearer conflict resolution