mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2024-11-14 16:55:42 +00:00
Remove Merge marker.
This commit is contained in:
parent
e9da8befd4
commit
b34b46ae5d
@ -8,9 +8,4 @@ Flask-SQLAlchemy
|
||||
Flask-Table
|
||||
Flask-WTF
|
||||
jsonpatch
|
||||
<<<<<<< HEAD
|
||||
psycopg2
|
||||
python-dotenv
|
||||
=======
|
||||
>>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
|
||||
redis
|
||||
|
Loading…
Reference in New Issue
Block a user