[CI-SKIP] Merge branch 'master' into pre/1.13

* master:
  [CI-SKIP] add .editorconfig for base code style settings
This commit is contained in:
Aikar 2018-08-07 01:14:43 -04:00
commit 327e58f9e4
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE

6
.editorconfig Normal file
View file

@ -0,0 +1,6 @@
[*.java]
charset=utf-8
end_of_line=lf
insert_final_newline=true
indent_style=space
indent_size=4