Skip to content

Commit 6bf32f8

Browse files
graydongraydon
committed
make shell scripts mergeable
1 parent 5cfcc45 commit 6bf32f8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
*.sln text -merge eol=crlf
22
*.vcxproj text -merge eol=crlf
33
*.vcxproj.filters text -merge eol=crlf
4-
*.sh text -merge eol=lf
4+
*.sh text merge eol=lf

0 commit comments

Comments
 (0)