fix conflict in requires.txt

This commit is contained in:
dawoodkhan82 2019-07-23 14:44:11 -07:00
parent d7f0a5a86e
commit 26e6a930a8

View File

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