Fixing merge tool induced file endings

This commit is contained in:
Jon Gregorowicz 2016-02-16 00:49:41 -05:00
parent 8b5e5173d0
commit 511329c30a
3 changed files with 3 additions and 3 deletions