From d2b64f764c5adce8bb0abe366b7423cf1319dd99 Mon Sep 17 00:00:00 2001
From: Jiao Dong <jiaodong@anyscale.com>
Date: Fri, 30 Jul 2021 13:47:32 -0700
Subject: [PATCH] merge conflict

---
 python/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/setup.py b/python/setup.py
index 90ae629b0705..af3316b6af86 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -137,7 +137,7 @@
         "pyyaml",
         "scipy",
     ]
-}
+
 if sys.version_info >= (3, 7, 0):
     extras["k8s"].append("kopf")