From: Jonathan Kawohl <john@owncloud.com>
Date: Tue, 13 Dec 2016 08:12:50 +0000 (+0100)
Subject: fixed merge conflicts
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~964
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5bae2ed5efcf291eba98d2ae70c268c5630983ca;p=nextcloud-desktop.git

fixed merge conflicts
---

diff --git a/doc/building.rst b/doc/building.rst
index cae2e3edd..f2376e706 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -68,17 +68,9 @@ To set up your build environment for development using HomeBrew_:
 
 1. Install Xcode
 2. Install Xcode command line tools::
-<<<<<<< HEAD
     xcode-select --install
 
 3. Install homebrew::
-=======
-
-    xcode-select --install
-
-3. Install homebrew::
-
->>>>>>> ca9ec4625391ae23940b3a62aaa0afe89f3d98e8
     /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
 4. Add the ownCloud repository using the following command::