Additional merges

This commit is contained in:
Bryan Ashby 2015-12-12 16:30:05 -07:00
commit a058a8f546
1 changed files with 4 additions and 0 deletions

4
.gitattributes vendored
View File

@ -1,4 +1,8 @@
*.asc eol=crlf *.asc eol=crlf
*.ASC eol=crlf
*.ans eol=crlf *.ans eol=crlf
*.ANS eol=crlf
*.txt eol=crlf *.txt eol=crlf
*.TXT eol=crlf
*.diz eol=crlf *.diz eol=crlf
*.DIZ eol=crlf