Merge remote-tracking branch 'upstream/master' into merge-upstream

This commit is contained in:
Jamie Alessio 2017-02-26 15:46:50 -08:00
commit d674a82caa

View file

@ -15,7 +15,7 @@ See also: https://github.com/pre-commit/pre-commit
Add this to your `.pre-commit-config.yaml` Add this to your `.pre-commit-config.yaml`
- repo: git://github.com/pre-commit/pre-commit-hooks - repo: git://github.com/pre-commit/pre-commit-hooks
sha: '' # Use the sha you want to point at sha: v0.7.1 # Use the ref you want to point at
hooks: hooks:
- id: trailing-whitespace - id: trailing-whitespace
# - id: ... # - id: ...