Converted CR back to CRLF. SmartGit did this to me previously when merging.