Merge pull request #8354 from JosJuice/editorconfig-java-spaces

.editorconfig: Use spaces for Java code
2019-09-07 13:06:31 -04:00 · 2019-09-07 13:06:31 -04:00 · 828dc0f204
parent 40fc25b06d 90ccee11df
commit 828dc0f204
1 changed files with 1 additions and 5 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -4,7 +4,7 @@ root = true
 indent_size = 2
 trim_trailing_whitespace = true

-[*.{c,cpp,h}]
+[*.{c,cpp,h,java}]
 indent_style = space
 insert_final_newline = true
 max_line_length = 100
@ -20,10 +20,6 @@ indent_size = 4
 indent_style = space
 insert_final_newline = false

-[*.java]
-indent_style = tab
-insert_final_newline = true
-
 [*.xml]
 indent_size = 4
 indent_style = space