Merge branch 'new2.10' of http://124.156.157.155:8060/r/dg/dabao_wap into n...

李凌

4 days ago ad0348a7fb24e4350d65dd9f0d93bc26378e4794

1
2
3
4
5
6
7
8
9
root = true
 
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true