Merge changes with upstream

1 files changed, 21 insertions, 0 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..1cdb4ce2
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+indent_style = space
+
+# ktlint
+[*.{kt, kts}]
+disabled_rules = import-ordering