From b34b46ae5de99052161b05c60b657de1627ef13f Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Thu, 5 Sep 2019 14:58:25 +0200
Subject: [PATCH] Remove Merge marker.

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

diff --git a/requirements.txt b/requirements.txt
index a36d129c..19d3e6ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,9 +8,4 @@ Flask-SQLAlchemy
 Flask-Table
 Flask-WTF
 jsonpatch
-<<<<<<< HEAD
-psycopg2
-python-dotenv
-=======
->>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
 redis
-- 
GitLab