Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Ido Slonimsky committed Aug 7, 2023
1 parent dcb9275 commit 58f1793
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ maturin = "0.14.12"
watchdog = "2.2.1"
multiprocess = "0.70.14"
nestd = "0.3.1"
uvloop = { version = "0.17.0", markers = "sys_platform == 'darwin' and platform_machine == 'aarch_64' and platform_machine == 'x86_64' and platform_machine == 'i686'" }
uvloop = { version = "0.17.0", markers = "sys_platform != 'win32' and (sys_platform != 'cygwin' and platform_python_implementation != 'PyPy')" }
jinja2 = { version = "3.0.1", optional = true }

[tool.poetry.extras]
Expand Down

0 comments on commit 58f1793

Please sign in to comment.