From 475ec71740521e0bbbacc326c6f4e8f3c0ba1307 Mon Sep 17 00:00:00 2001
From: Jocavdh <joca@madebyjoca.com>
Date: Wed, 13 Jun 2018 13:57:25 +0200
Subject: [PATCH] fixed conflixt in pip requirements.txt

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

diff --git a/requirements.txt b/requirements.txt
index 542394a..598cc25 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,12 +16,8 @@ WTForms==2.1
 flask-marshmallow==0.9.0
 Wand==0.4.4
 PyPDF2==1.26.0
-<<<<<<< HEAD
 flask-socketio==2.9.2
 flask-whooshalchemyplus==0.7.5
 python-dotenv==0.7.1
-=======
 autocomplete==0.0.104
 
-
->>>>>>> 30d8bade54d8646ad4a5e314022d62e2dbf81755