Merge remote-tracking branch 'common/main'

lenskit · Apr 22, 2022 · 7d3ec1c · 7d3ec1c
2 parents 371edfd + 7ec4ee7
commit 7d3ec1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,14 +4,14 @@ root = true
 insert_final_newline = true
 charset = utf-8
 trim_trailing_whitespace = true
-
-[*.py]
-indent_style = space
 indent_size = 4
+indent_style = space
 
 [*.{yml,yaml}]
-indent_style = space
 indent_size = 2
 
 [*.sh]
 end_of_line = lf
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/lkbuild/lock-for-ci.sh b/lkbuild/lock-for-ci.sh