Remove empty leftover file from resolved merge conflict

This commit is contained in:
Björn Fromme
2021-10-04 12:06:24 +02:00
parent f319a0450c
commit 961acc5c19