Skip to content

Commit

Permalink
Update .gitattributes
Browse files Browse the repository at this point in the history
  • Loading branch information
walkor authored Oct 3, 2016
1 parent eb1d709 commit e5b0cd9
Showing 1 changed file with 3 additions and 21 deletions.
24 changes: 3 additions & 21 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
# Auto detect text files and perform LF normalization
* text=auto

# 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
*.js linguist-language=PHP
*.css linguist-language=PHP
*.html linguist-language=PHP

0 comments on commit e5b0cd9

Please sign in to comment.