Merge branch 'master' into file_contents_sorter_hook

This commit is contained in:
Daniel Gallagher 2017-06-25 09:39:21 -07:00
commit d188f2ecf8
8 changed files with 270 additions and 8 deletions

View file

@ -56,6 +56,7 @@ setup(
'no-commit-to-branch = pre_commit_hooks.no_commit_to_branch:main',
'pretty-format-json = pre_commit_hooks.pretty_format_json:pretty_format_json',
'requirements-txt-fixer = pre_commit_hooks.requirements_txt_fixer:fix_requirements_txt',
'sort-simple-yaml = pre_commit_hooks.sort_simple_yaml:main',
'trailing-whitespace-fixer = pre_commit_hooks.trailing_whitespace_fixer:fix_trailing_whitespace',
],
},