From 0d3c9a131f566f56a6256e3e507fbef3733c93c1 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Mon, 14 Nov 2016 14:47:23 -0500 Subject: [PATCH] Previous merge did not handle 1 more conflict properly :-( --- docs/starting/install/osx.rst | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index fe081b3..97baf03 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -33,7 +33,6 @@ minimal but unofficial package. .. note:: -<<<<<<< HEAD If you already have XCode installed, do not install OSX-GCC-Installer. In combination, the software can cause issues that are difficult to diagnose. @@ -41,11 +40,7 @@ package. .. note:: If you perform a fresh install of XCode, you will also need to add the commandline tools by running ``xcode-select --install`` on the terminal. -======= - If you already have Xcode installed or plan to use Homebrew, do not install - OSX-GCC-Installer. In combination, the software can cause issues that are - difficult to diagnose. ->>>>>>> upstream/master + While OS X comes with a large number of UNIX utilities, those familiar with Linux systems will notice one key component missing: a decent package manager.