Skip to content

Commit a685d38

Browse files
nedtwiggnedtwigg
committed
Merge branch 'main' into bugfix/fix-freshmark-on-jdk15-and-higher
2 parents 225d992 + aa78b56 commit a685d38

File tree

285 files changed

+9765
-3170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+9765
-3170
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 385 deletions
This file was deleted.

‎.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ ij_java_names_count_to_use_import_on_demand = 999
2121

2222
[*.xml.mustache]
2323
indent_style = space
24+
25+
[*.{yml,yaml}]
26+
indent_style = space
27+
indent_size = 2

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* text eol=lf
2+
*.bat eol=crlf
23
*.png binary
34
*.jar binary

0 commit comments

Comments
 (0)