Sort these line ending inconsistencies out once and for all. CRLF settings should be "Check out as-is, commit as-is".