Skip to content

Commit 84f8fb6

Browse files
committed
Fix line endings in java-options.conf
The flux.bat batch script requires the config filed to use CRLF as line endings. (cherry picked from commit 87ff6a2)
1 parent 8a82fa0 commit 84f8fb6

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ indent_size=2
3333

3434
[*.bat]
3535
end_of_line=crlf
36+
37+
[metafacture-runner/src/main/dist/config/java-options.conf]
38+
end_of_line=crlf

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# The batch script can only handle the config
2121
# properly if it uses crlf as end-of-line marker:
22-
metafacture-runner/src/main/config/java-options.conf text eol=crlf
22+
metafacture-runner/src/main/dist/config/java-options.conf text eol=crlf
2323

2424
# Denote all files that are truly binary and should not be modified:
2525
*.bz2 binary

0 commit comments

Comments
 (0)