commit cf550fcab3f12015f8676b8278b30e1a5bc10e70
author Anthony Sottile <asottile@umich.edu> Sun May 31 14:02:52 2015 -0700
committer Anthony Sottile <asottile@umich.edu> Sun May 31 14:02:52 2015 -0700
tree 0ace592c0a1042ecb17917764f144ce0079509aa
parent f138e3451bc0a8fa5119b5dbfcf987bcc5ba16f1

v0.4.2

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index a6c76bc..b929872 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+0.4.2
+=====
+- Add --django to test name checker
+- Add check-merge-conflict hook
+- Remove dependency on plumbum
+- Add q as a debug statement
+- Don't detect markup titles as conflicts
+- Teach trailing-whitespace about markdown
+- Quickfix for pyflakes - flake8 version conflict
+
 0.4.1
 =====
 - Respect configuration when running autopep8

setup.py

diff --git a/setup.py b/setup.py
index 4e04461..b24c05e 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
     name='pre_commit_hooks',
     description='Some out-of-the-box hooks for pre-commit.',
     url='https://github.com/pre-commit/pre-commit-hooks',
-    version='0.4.1',
+    version='0.4.2',
 
     author='Anthony Sottile',
     author_email='asottile@umich.edu',