From 58f1793e3d49609680c7b996d14f93ae2192f757 Mon Sep 17 00:00:00 2001
From: Ido Slonimsky <ido.slonimsky@zesty.co>
Date: Mon, 7 Aug 2023 10:31:11 +0300
Subject: [PATCH] fix: merge conflict

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0c7e76173..c9ae63e66 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -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]