.gitattributes

*.vcxproj  eol=crlf
*.sln      eol=crlf
<<<<<<< HEAD
=======
*.bat      eol=crlf
>>>>>>> upstream/master