experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Forgot about a couple of conflicts.

Browse Source
This commit is contained in:
Amit Patankar 2017-06-30 10:34:08 -07:00
parent e9f357b16b
commit 86bb48c21e
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tensorflow/docs_src/install/install_linux.md
View File

@ -276,13 +276,8 @@ take the following steps:
the following command:
<pre>
<<<<<<< HEAD
$ <b>sudo pip install --upgrade \
https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.2.0-cp27-none-linux_x86_64.whl</b>
=======
$ <b>sudo pip3 install --upgrade \
https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.2.1-cp34-cp34m-linux_x86_64.whl</b>
>>>>>>> google/r1.2
</pre>
If this step fails, see
@ -469,11 +464,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
<pre>
(tensorflow)$ <b>pip install --ignore-installed --upgrade \
<<<<<<< HEAD
https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.2.0-cp27-none-linux_x86_64.whl</b></pre>
=======
https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.2.1-cp34-cp34m-linux_x86_64.whl</b></pre>
>>>>>>> google/r1.2
<a name="ValidateYourInstallation"></a>

5
tensorflow/docs_src/install/install_mac.md
View File

@ -229,13 +229,8 @@ take the following steps:
you are installing TensorFlow for Mac OS and Python 2.7
issue the following command:
<<<<<<< HEAD
<pre> $ <b>sudo pip install --upgrade \
https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.2.0-py2-none-any.whl</b> </pre>
=======
<pre> $ <b>sudo pip3 install --upgrade \
https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.2.1-py2-none-any.whl</b> </pre>
>>>>>>> google/r1.2
If the preceding command fails, see
[installation problems](#common-installation-problems).