Merge branch 'master' into ext-perl

diff --git a/.editorconfig b/.editorconfig
index d140832e01e32bdcab2778da170f232104b3d35c..d9a081ed5da36ffa74b402157f3b4f6f57e6c787 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,13 +7,13 @@
 charset                     = utf8
 indent_size                 = 4
 indent_style                = tab
-insert_final_newline        = true
-trim_trailing_whitespace    = true
+insert_final_newline        = false
+trim_trailing_whitespace    = false
 
 [*.xml]
 charset                     = utf8
 indent_size                 = 2
 indent_style                = space
-insert_final_newline        = true
-trim_trailing_whitespace    = true
+insert_final_newline        = false
+trim_trailing_whitespace    = false