Slight adjustment to Sataniel's fixes to preserve tab-based indentation for easy merge compare.

This commit is contained in:
ProgrammerDan
2016-04-18 18:15:30 -04:00
parent ddaa2bdbfc
commit 2d0d059008
5 changed files with 779 additions and 763 deletions
+16
View File
@@ -0,0 +1,16 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
[*.java]
indent_style = tab
indent_size = 4
trim_trailing_whitespace = true
[*.yml]
indent_style = spaces
indent_size = 2
trim_trailing_whitespace = true