merge

microsoft · scarlett2018 · Nov 2, 2018 · Oct 18, 2018 · Oct 19, 2018 · Oct 19, 2018
commit 1ce3310d67391191ad23b4a5407d115c18e7dd92
diff --git a/docs/InstallNNI_Ubuntu.md b/docs/InstallNNI_Ubuntu.md
@@ -12,12 +12,7 @@
 
 * __Install NNI through pip__
 
-<<<<<<< HEAD
-      pip3 install -v --user git+https://github.com/Microsoft/[email protected]
-      source ~/.bashrc
-=======
       python3 -m pip install --user nni-pkg
->>>>>>> upstream/master
 
 * __Install NNI through source code__