Correct merge error in f751811761

This commit is contained in:
Nate Coraor
2021-02-09 12:09:20 -05:00
parent 1a08efb57a
commit b064d13bc5
@@ -160,8 +160,8 @@ simplejson==3.17.2; python_version >= "3.6" and python_full_version < "3.0.0" or
six==1.15.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version >= "3.6" and python_version < "4"
social-auth-core==3.3.0
sortedcontainers==2.3.0
sqlalchemy-json==0.4.0
sqlalchemy-migrate==0.13.0
sqlalchemy-mutable==0.0.11; python_version >= "3.6"
sqlalchemy-utils==0.36.7
sqlalchemy==1.3.22; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
sqlitedict==1.7.0