Fix bad merge (#126)
This commit is contained in:
parent
511805e36c
commit
eae9f9826a
2 changed files with 3 additions and 2 deletions
|
@ -25,4 +25,3 @@ indent_style = tab
|
|||
indent_style = space
|
||||
indent_size = 4
|
||||
trim_trailing_whitespace = false
|
||||
|
||||
|
|
Reference in a new issue