Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewfrench committed Nov 16, 2023
1 parent cc7dfae commit 7e65ce6
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@ readme = "README.md"

[tool.poetry.dependencies]
python = ">=3.9,<3.12"
<<<<<<< Updated upstream
attr = "^0.3.2"
schema = "^0.7.5"
requests = "^2.31.0"
griptape = "^0.20.0"
=======
griptape = ">=0.20,<0.21"
>>>>>>> Stashed changes

[tool.poetry.group.test]
optional = true
Expand Down

0 comments on commit 7e65ce6

Please sign in to comment.