fix conflict in requires.txt

This commit is contained in:
dawoodkhan82 2019-07-23 14:44:11 -07:00
parent 5fd835ef07
commit c1736dae17

View File

@ -6,7 +6,4 @@ psutil
paramiko
scipy
IPython
<<<<<<< HEAD
scikit-image
=======
>>>>>>> master