Revert .gitattributes to their original state

This reverts commits a0dd1f0 and 08ea77a
This commit is contained in:
Lemongrass3110 2016-08-02 19:43:06 +02:00
parent 5fabab9c1e
commit 472b30b830

24
.gitattributes vendored
View File

@ -1,14 +1,12 @@
* text=auto
*.c diff=cpp eol=crlf
*.h diff=cpp eol=crlf
*.sln merge=union
*.vcproj merge=union
*.vcxproj merge=union
*.sln text eol=crlf
*.bat text eol=crlf
configure text eol=lf
* text=auto
*.c diff=cpp
*.sln merge=union
*.vcproj merge=union
*.vcxproj merge=union
*.sln text eol=crlf
*.bat text eol=crlf
configure text eol=lf
configure.in text eol=lf
Makefile text eol=lf
Makefile.in text eol=lf
*.sh text eol=lf
*.sql text eol=crlf
Makefile text eol=lf
Makefile.in text eol=lf
*.sh text eol=lf