Merge branch 'dev'
This commit is contained in:
commit
afc0a5e5b2
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -2,7 +2,7 @@
|
||||
# Set default behavior to automatically normalize line endings.
|
||||
###############################################################################
|
||||
* text=auto
|
||||
* .sh text eol=lf
|
||||
*.sh text eol=lf
|
||||
|
||||
###############################################################################
|
||||
# Set default behavior for command prompt diff.
|
||||
|
Loading…
x
Reference in New Issue
Block a user