Skip to content

Commit

Permalink
conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
HannesHasselbring committed Mar 8, 2023
2 parents c138d0d + 575119b commit 2e400ab
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
64 changes: 32 additions & 32 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 @@ -58,7 +58,7 @@ pytest = "^7.2.1"
Flask-Testing = "^0.8.1"
requests = "^2.28.2"
black = "^23.1.0"
pre-commit = "^3.0.4"
pre-commit = "^3.1.0"

[tool.poetry.extras]
docs = ["sphinx", "sphinx_rtd_theme"]
Expand Down

0 comments on commit 2e400ab

Please sign in to comment.