From 164c0c665e4ce60fb58b5c380810fe01f062c8cd Mon Sep 17 00:00:00 2001 From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr> Date: Mon, 23 Mar 2020 09:56:11 -0400 Subject: [PATCH] Conflict solved" --- requirements.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 769db82f..7b79ed9d 100755 --- a/requirements.txt +++ b/requirements.txt @@ -16,8 +16,5 @@ pyyaml==3.12 cvxopt==1.2.0 plotly==4.2.1 matplotlib==3.1.1 -<<<<<<< HEAD -e git+https://gitlab.lis-lab.fr/dominique.benielli/multiviewmetriclearning -======= tabulate==0.8.6 ->>>>>>> develop -- GitLab