specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed content from merge conflict

Browse source
This commit is contained in:
Kristian Sloth Lauszus 2015-02-22 20:37:42 +01:00
parent d25f28109d
commit 82f7088578
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitattributes vendored
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
# Auto detect text files and perform LF normalization # Auto detect text files and perform LF normalization
* text=auto * text=auto
* text eol=lf * text eol=lf
@ -22,6 +21,3 @@
*.PDF diff=astextplain *.PDF diff=astextplain
*.rtf diff=astextplain *.rtf diff=astextplain
*.RTF diff=astextplain *.RTF diff=astextplain
=======
text eol=lf
>>>>>>> acca3c8fe06a3d95806a8656c8a6ddef081cc210