Fix identing after conflict resolve merge.

This commit is contained in:
Patrikkk 2020-06-02 11:41:41 +02:00
parent f01274164f
commit 0619092ba5