mirror of
https://github.com/felis/USB_Host_Shield_2.0.git
synced 2024-03-22 11:31:26 +01:00
28 lines
579 B
Text
28 lines
579 B
Text
|
<<<<<<< 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
|