Skip to content
Snippets Groups Projects
Commit b34b46ae authored by Patrick Jentsch's avatar Patrick Jentsch
Browse files

Remove Merge marker.

parent e9da8bef
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 5 deletions
requirements.txt
+ 0
− 5
View file @ b34b46ae
......@@ -8,9 +8,4 @@ Flask-SQLAlchemy
Flask-Table
Flask-WTF
jsonpatch
<<<<<<< HEAD
psycopg2
python-dotenv
=======
>>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
redis
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment