From f0cc78f01f8b19180d163b52ce3d76a0e90806eb Mon Sep 17 00:00:00 2001
From: Audrey Roy Greenfeld <aroy@alum.mit.edu>
Date: Sat, 26 Sep 2015 00:47:44 -0700
Subject: [PATCH] Move .pep8 to setup.cfg.

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

diff --git a/{{cookiecutter.repo_name}}/.pep8 b/{{cookiecutter.repo_name}}/.pep8
deleted file mode 100644
index 3996f1ae..00000000
--- a/{{cookiecutter.repo_name}}/.pep8
+++ /dev/null
@@ -1,3 +0,0 @@
-[pep8]
-max-line-length = 120
-exclude=.tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
diff --git a/{{cookiecutter.repo_name}}/setup.cfg b/{{cookiecutter.repo_name}}/setup.cfg
index 3084e402..c18b80d9 100644
--- a/{{cookiecutter.repo_name}}/setup.cfg
+++ b/{{cookiecutter.repo_name}}/setup.cfg
@@ -1,3 +1,7 @@
 [flake8]
 max-line-length = 120
 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
+
+[pep8]
+max-line-length = 120
+exclude=.tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules