Line endings (merge conflicts)

[santosdiez]

Hi,

I'm having issues when merging your master branch with my repo, and most of the times not because of the content itself but because of the line endings.

I'm using LF line endings (UNIX line endings), and I guess you're using CRLF line endings in some files (the Windows ones). Would it be possible for you to make sure that all files have the same line endings? (LF or CRLF, but the same one at least).

It would be nice, just to avoid these conflicts which sometimes drive me mad...

Cheers!