From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Sun, 11 Dec 2022 22:26:05 +0000 (+0100)
Subject: remove artefacts from manual merge gone wrong
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/51cd86d8e21a3332aa00a31c882ca51cb3ece224?hp=51cd86d8e21a3332aa00a31c882ca51cb3ece224

remove artefacts from manual merge gone wrong
---