Skip to content

Commit

Permalink
attempt to resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahgibs committed Oct 11, 2024
1 parent 7f9fc35 commit f2ff80c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sdarq/backend/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Flask==3.0.3
Flask==2.1.3
Flask-Limiter==3.8.0
requests==2.32.3
requests-oauthlib==1.0.0
requests>=2.32.3
requests-oauthlib>=1.0.0
urllib3==1.26.19
flask-api==3.1
flask-cors==4.0.1
Expand All @@ -16,6 +16,6 @@ google-cloud-logging==3.11.1
google-cloud-resource-manager==1.12.5
google-api-core[grpc]==2.19.1
python-owasp-zap-v2.4==0.1.0
werkzeug==3.0.3
werkzeug==2.1.2
jsonschema==4.23.0
markupsafe>=2.0.1

0 comments on commit f2ff80c

Please sign in to comment.