Fixed merge conflict

This commit is contained in:
alexjanousekGSA
2025-06-09 12:10:35 -04:00
9 changed files with 60 additions and 94 deletions

View File

@@ -40,7 +40,6 @@ marshmallow = "^4.0.0"
marshmallow-sqlalchemy = "^1.4.2"
newrelic = "*"
notifications-python-client = "==10.0.1"
oscrypto = { git = "https://github.com/wbond/oscrypto.git", rev = "1547f53" }
packaging = "==25.0"
poetry-dotenv-plugin = "==0.2.0"
psycopg2-binary = "==2.9.10"