Merge branch 'master' of github.com:ground-context/ground

ground-context · Mar 12, 2017 · 96d5278 · 96d5278
2 parents adc57cb + 9da8234
commit 96d5278
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -2,9 +2,15 @@
 root = true
 
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.java]
+[*.{java,json,sh}]
 indent_style = space
 indent_size = 2
+
+[*.{py,sql}]
+indent_style = space
+indent_size = 4