attributes

This commit is contained in:
Andrew J. Kroll 2015-02-22 13:03:05 -05:00
parent bd8c8e7404
commit 56c0265fa8

27
.gitattributes vendored Normal file
View file

@ -0,0 +1,27 @@
<<<<<<< HEAD
# Auto detect text files and perform LF normalization
* text=auto
* text eol=lf
# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
=======
text eol=lf
>>>>>>> acca3c8fe06a3d95806a8656c8a6ddef081cc210