diff options
| author |  Amit Patankar <amitpatankar@google.com> | 2018-07-31 12:52:09 -0700 |
|---|---|---|
| committer | Amit Patankar <amitpatankar@google.com> | 2018-07-31 12:52:09 -0700 |
| commit | e5b24e83ec7c307a62a2ff807df0149df5605387 (patch) | |
| tree | 0a7c79714286ef4800cb396be3c71ab2247ed836 /tensorflow/docs_src | |
| parent | f9410ac2e50d961adbea6b4805f82da90116bebe (diff) | |
Fixing some merge conflicts I missed.
Diffstat (limited to 'tensorflow/docs_src')
| -rw-r--r-- | tensorflow/docs_src/install/install_mac.md | 4 | ||||
| -rw-r--r-- | tensorflow/docs_src/install/install_sources.md | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md index 30800f3f03..3a8637bfb1 100644 --- a/tensorflow/docs_src/install/install_mac.md +++ b/tensorflow/docs_src/install/install_mac.md @@ -350,11 +350,7 @@ Take the following steps to install TensorFlow in an Anaconda environment: TensorFlow for Python 2.7: <pre> (<i>targetDirectory</i>)$ <b>pip install --ignore-installed --upgrade \ -<<<<<<< HEAD - https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.9.0-py2-none-any.whl</b></pre> -======= https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.10.0rc1-py2-none-any.whl</b></pre> ->>>>>>> google/r1.10 <a name="ValidateYourInstallation"></a> diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md index 0df534f289..a7c0b6970a 100644 --- a/tensorflow/docs_src/install/install_sources.md +++ b/tensorflow/docs_src/install/install_sources.md @@ -282,7 +282,6 @@ Please specify the NCCL version you want to use. If NCLL 2.2 is not installed, t Please specify a list of comma-separated Cuda compute capabilities you want to build with. You can find the compute capability of your device at: https://developer.nvidia.com/cuda-gpus. -<<<<<<< HEAD Please note that each additional compute capability significantly increases your build time and binary size. [Default is: 3.5,7.0] <b>6.1</b> |