If you have this error then your files are stored with CRLF line-endings, which is against the coding standards.
Use an editor that is capable of saving files with LF line-endings, and configure your git client properly. See http://help.github.com/line-endings/ for more information.