Merge pull request #5611 from pradyunsg/misc/fix-linting

Fix a merging artifact that broke the linting
This commit is contained in:
Pradyun Gedam 2018-07-17 13:48:36 +05:30 committed by GitHub
commit 15e6b7c8b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 45 deletions