fix auto merge

This commit is contained in:
Dario via Pythagoras 2020-06-11 13:32:44 +02:00
commit 562b47072d