From 65679144035ce25b2652598e75faf5eb7af29908 Mon Sep 17 00:00:00 2001
From: James Curtin <jameswcurtin@gmail.com>
Date: Wed, 29 May 2019 13:17:48 -0400
Subject: [PATCH] Bugfix pipfile Merge conflict wasn't fully resolved. Doh!

---
 {{cookiecutter.app_name}}/Pipfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/{{cookiecutter.app_name}}/Pipfile b/{{cookiecutter.app_name}}/Pipfile
index 26eb0ba..c813b7b 100644
--- a/{{cookiecutter.app_name}}/Pipfile
+++ b/{{cookiecutter.app_name}}/Pipfile
@@ -49,12 +49,8 @@ environs = "==4.1.3"
 # Testing
 pytest = "==4.5.0"
 WebTest = "==2.0.33"
-<<<<<<< HEAD
 factory-boy = "==2.12.*"
-=======
-factory-boy = "==2.11.*"
 pdbpp = "==0.10.0"
->>>>>>> ae5c375... Implement docker environment
 
 # Lint and code style
 flake8 = "==3.7.7"