Restore trailing whitespace for merge

This commit is contained in:
Fang 2018-08-28 16:31:43 +02:00
parent 6d01b1d0c4
commit 81c36e3a86