merge resolution

Edmond Yoo

2018-09-06 eb46166f1130d6c6fb5d41d6090a86b35d1542fc

1
2
3
4
5
6
root=true
 
[*]
trim_trailing_whitespace = true
indent_style = space
indent_size = 4