Skip to content

Commit

Permalink
resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
gabelton committed Jun 5, 2024
2 parents b9f9798 + b52264b commit 78a27bb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pip-tools = "^7.3.0"
psycopg2-binary = "^2.9.9"
python-dotenv = "^1.0.0"
redis = "^5.0.1"
requests = "^2.31.0"
requests = "^2.32.2"
tenacity = "^8.2.3"
whitenoise = "^6.6.0"
normality = "^2.5.0"
Expand Down

0 comments on commit 78a27bb

Please sign in to comment.