Merge pull request #14654 from ColinKinloch/master

Fixed inconsistent use of tabs and spaces in indentation.
This commit is contained in:
Rémi Verschelde 2017-12-14 15:01:34 +01:00 committed by GitHub
commit 9fab381141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions

View File

@ -8,6 +8,10 @@ indent_style = tab
[*.{cpp,hpp,c,h,mm}]
trim_trailing_whitespace = true
[*.py]
indent_style = space
indent_size = 4
[.travis.yml]
indent_style = space
indent_size = 2