small merge fix

This commit is contained in:
Volker Fischer 2020-05-24 12:29:57 +02:00
parent 51753f680e
commit 094c97ac55