summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2019-01-04 16:53:32 +0100
committerManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2019-01-04 16:53:32 +0100
commit2575e7ef6b7c49a8a660efa6eaaaa974b2295931 (patch)
treef6dd5eb361b77fc2fdc9153f0238d40c690298cf /.gitattributes
parent06fdfaf8221b6c4bd5ff9d85a598e1387748eb6d (diff)
parent51462930eba048d59c4bea031b671f88d48e75a2 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index c706bfbe8..3fd62ba29 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -39,6 +39,7 @@ misc/update_config_scripts eol=lf
# files with Windows line endings (crlf)
*.rc eol=crlf
+*.bat eol=crlf
# Android Studio special support file (Windows .bat file)
ide/AndroidStudio3/gradlew.rename_to_bat eol=crlf