Skip to content
Snippets Groups Projects
Commit 164c0c66 authored by Baptiste Bauvin's avatar Baptiste Bauvin
Browse files

Conflict solved"

parent 09925071
No related branches found
No related tags found
No related merge requests found
Pipeline #4322 failed
Stage: test
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 3 deletions
requirements.txt
+ 0
− 3
View file @ 164c0c66
...@@ -16,8 +16,5 @@ pyyaml==3.12 ...@@ -16,8 +16,5 @@ pyyaml==3.12
cvxopt==1.2.0 cvxopt==1.2.0
plotly==4.2.1 plotly==4.2.1
matplotlib==3.1.1 matplotlib==3.1.1
<<<<<<< HEAD
-e git+https://gitlab.lis-lab.fr/dominique.benielli/multiviewmetriclearning -e git+https://gitlab.lis-lab.fr/dominique.benielli/multiviewmetriclearning
=======
tabulate==0.8.6 tabulate==0.8.6
>>>>>>> develop
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment