resolve merge conflict

bpblanken · bpblanken · commit a3f9cddfa9be · 2024-02-29T13:25:53.000-05:00
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -38,7 +38,7 @@ idna==3.6
     #   requests
 imagesize==1.4.1
     # via sphinx
-jinja2==3.1.2
+jinja2==3.1.3
     # via
     #   -c requirements.txt
     #   sphinx
diff --git a/requirements.txt b/requirements.txt
@@ -202,7 +202,7 @@ numpy==1.26.2
     #   scipy
 oauthlib==3.2.2
     # via requests-oauthlib
-orjson==3.9.15
+orjson==3.9.11
     # via hail
 packaging==23.2
     # via
