From b064d13bc5c41a985d035a165213c73dd7355a97 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Tue, 9 Feb 2021 12:09:20 -0500 Subject: [PATCH] Correct merge error in f7518117619bc695ee62479729efeb96c6542694 --- lib/galaxy/dependencies/pinned-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt index 3b33a2a9581..bdb49c22212 100644 --- a/lib/galaxy/dependencies/pinned-requirements.txt +++ b/lib/galaxy/dependencies/pinned-requirements.txt @@ -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