Merge remote-tracking branch 'origin/performance_test' into performance_test

Conflicts:
	pre_commit/languages/python.py
This commit is contained in:
Anthony Sottile
2014-03-14 00:31:51 -07:00

View File

@@ -46,4 +46,4 @@ def run_hook(hook, file_args):
with in_env() as env:
env = env
# MAGIC
pass
pass