Merge branch '1.5.x'
This commit is contained in:
commit
7f270356ed
|
@ -1,3 +1,9 @@
|
||||||
[*]
|
root=true
|
||||||
|
|
||||||
|
[*.java]
|
||||||
indent_style = tab
|
indent_style = tab
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
|
|
||||||
|
[*.xml]
|
||||||
|
indent_style = tab
|
||||||
|
indent_size = 4
|
||||||
|
|
Loading…
Reference in New Issue