From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 Jan 2020 21:07:25 +0000 (+0100)
Subject: fix bad merge
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=8a1cae77d279cc246a68109f6178b2bb05e7471f;hp=8a1cae77d279cc246a68109f6178b2bb05e7471f;p=fanfix.git

fix bad merge
---