From: Benjamin Auder <benjamin.auder@somewhere>
Date: Mon, 12 Feb 2018 19:10:25 +0000 (+0100)
Subject: Forgot one conflict
X-Git-Url: https://git.auder.net/?a=commitdiff_plain;h=bc90ee3e67f85887da032580c84bfb8382fe6e1b;hp=bc90ee3e67f85887da032580c84bfb8382fe6e1b;p=erdiag.git

Forgot one conflict
---