From be0a3fb1f2c9dddf4f7fead26e2f97c54a92c016 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 7 Mar 2017 16:55:49 -0500
Subject: [PATCH] Corrected merge conflict

---
 requirements.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ddf3a336f..2c6044f73 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,11 +2,7 @@ cffi>=1.8
 cryptography>=1.4
 Django>=1.10
 django-debug-toolbar>=1.6
-<<<<<<< HEAD
-django-filter==0.15.3
-=======
 django-filter>=1.0.1
->>>>>>> develop
 django-mptt==0.8.7
 django-rest-swagger==0.3.10
 django-tables2>=1.2.5