From a5539bc2885c6835bd4c6361d7a5824753df29a8 Mon Sep 17 00:00:00 2001 From: Guido Marucci Blas Date: Wed, 9 Nov 2016 10:45:27 -0300 Subject: [PATCH] Fix rebase conflict. --- CONTRIBUTING.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bc98307d82..c1d360eb1f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,11 +37,7 @@ brew install carthage ## Run Carthage from Xcode -<<<<<<< HEAD -It may be useful to run Carthage on different `Cartfile`s or in "real" project for debugging purpouse or to learn how Carthage works. Carthage is a regular macOS application so you can run it inside Xcode and set breakpoints! To do so you may want to change the arguments passed to Carthage's command line tool and probably also change the working directory. -======= -I may be useful to run Carthage on different `Cartfile`s or in "real" project for debugging purpose or to learn how Carthage works. Carthage is a regular macOS application so you can run it inside Xcode and set breakpoints! To do so you may want to change the arguments passed to Carthage's command line tool and probably also change the working directory. ->>>>>>> Fix typo. +It may be useful to run Carthage on different `Cartfile`s or in "real" project for debugging purpose or to learn how Carthage works. Carthage is a regular macOS application so you can run it inside Xcode and set breakpoints! To do so you may want to change the arguments passed to Carthage's command line tool and probably also change the working directory. 1. Select the `carthage` scheme in the Scheme chooser. ![step01](./Documentation/Resources/Contributing/RunCarthageFromXcode/step01.png)