Fix weird formatting added during the merge

This commit is contained in:
scrawl 2014-01-01 16:13:20 +01:00
parent b3cd10dbea
commit 69ba8a40bf