Fix trailing spaces on merge

This commit is contained in:
Damian Mooyman 2016-04-29 17:54:52 +12:00
parent d52db0ba34
commit baa3d4e7d7
2 changed files with 31 additions and 31 deletions