Skip to content

Commit 307f46a

Browse files
committed
Fix line endings in msi
Fixes sbt#6717
1 parent aa22c02 commit 307f46a

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

.gitattributes

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
sbt text eol=lf
2+
*.sh text eol=lf
3+
launcher-package/src/windows/sbt text eol=lf
4+
15
# Exclude contraband generated files from diff (by default - you can see it if you want)
26
**/contraband-scala/**/* -diff merge=ours
37
**/contraband-scala/**/* linguist-generated=true

launcher-package/src/windows/sbt

+1
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ else
3636
# Use Jansi to intercept ANSI sequences
3737
"$JAVA_CMD" -Dsbt.log.format=true $JAVA_OPTS $SBT_OPTS -cp "$WDIR/sbt-launch.jar" xsbt.boot.Boot "$@"
3838
fi
39+

0 commit comments

Comments
 (0)