Remove Merge marker.

This commit is contained in:
Patrick Jentsch 2019-09-05 14:58:25 +02:00
parent e9da8befd4
commit b34b46ae5d

View File

@ -8,9 +8,4 @@ Flask-SQLAlchemy
Flask-Table
Flask-WTF
jsonpatch
<<<<<<< HEAD
psycopg2
python-dotenv
=======
>>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
redis