From f45840acb51bc0883412576c2b3f6eec00461e9e Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Thu, 5 Jun 2014 16:39:09 -0400
Subject: [PATCH] Move .pep8 content to setup.cfg

---
 .pep8     | 3 ---
 setup.cfg | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 .pep8

diff --git a/.pep8 b/.pep8
deleted file mode 100644
index badb0219a0..0000000000
--- a/.pep8
+++ /dev/null
@@ -1,3 +0,0 @@
-[pep8]
-ignore=E501
-exclude=migrations
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 45d3aa27cf..f5a7de158e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,3 +14,7 @@ no-path-adjustment=1
 # Uncomment the following lines to open pdb when a test fails
 #nocapture=1
 #pdb=1
+
+[pep8]
+ignore=E501
+exclude=migrations