From 3c0b761e0db43c053779223a0eaf37ca3ec91507 Mon Sep 17 00:00:00 2001 From: Pengyuan Zhou Date: Mon, 22 Jun 2020 11:08:56 +0300 Subject: [PATCH 1/2] rm duplicate --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ccb971a99..f06de02ee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,6 @@ matplotlib==3.1.0 imutils==0.5.1 numpydoc ray==0.7.3 -opencv-python dill lz4 setproctitle From 0bed2cde3695c34d69e50654c760301da1380d0d Mon Sep 17 00:00:00 2001 From: Pengyuan Zhou Date: Fri, 24 Jul 2020 15:43:25 +0300 Subject: [PATCH 2/2] try resolve conflict --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f06de02ee..bfafa68dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pyglet==1.3.2 matplotlib==3.1.0 imutils==0.5.1 numpydoc -ray==0.7.3 +ray==0.8.0 dill lz4 setproctitle