Fix bad merge (#126)

This commit is contained in:
Ben Schumacher 2020-09-17 02:36:58 +02:00 committed by GitHub
parent 511805e36c
commit eae9f9826a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -25,4 +25,3 @@ indent_style = tab
indent_style = space
indent_size = 4
trim_trailing_whitespace = false