Merge branch 'master' into locate-msbuild

OmniSharp · Oct 26, 2017 · 3de0818 · 3de0818
2 parents 35911ce + ecde655
commit 3de0818
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -49,3 +49,5 @@
 *.dbproj text=auto
 *.xproj text=auto
 *.sln text=auto eol=crlf
+
+*.sh text eol=lf