fix diffconflicts with CRLF EOL files
Merge pull request #9 from apendragon/fix_diffconflicts_crlf

fix diffconflicts with CRLF EOL files