From 7023e441185ddacd050125f76e7bae3b1bb07a76 Mon Sep 17 00:00:00 2001
From: Eric Cano <Eric.Cano@cern.ch>
Date: Mon, 21 Oct 2019 10:11:40 +0200
Subject: [PATCH] Fixed failed merge in buildtree scripts.

---
 .../buildtree_runner/vmBootstrap/bootstrapCTA.sh         | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
index 219ed85fe6..aeeb77e0c9 100755
--- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
+++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
@@ -19,16 +19,9 @@ mkdir -p ~/CTA-build-srpm
 (cd ~/CTA-build-srpm && cmake -DPackageOnly:Bool=true ../CTA; make cta_srpm)
 
 echo Installing repos
-<<<<<<< HEAD
-for r in `ls -1 ../../docker/ctafrontend/cc7/etc/yum.repos.d/*.repo`; do
-  yum-config-manager --add-repo=$r
-done
-sudo yum-config-manager --add-repo=ceph-internal.repo
-=======
-for r in `ls ../../docker/ctafrontend/cc7/etc/yum.repos.d/*.repo` ceph-internal.repo; do
+for r in `ls -1 ../../docker/ctafrontend/cc7/etc/yum.repos.d/*.repo` ceph-internal.repo; do
   sudo yum-config-manager --add-repo=$r
 done
->>>>>>> origin/master
 sudo yum install -y yum-plugin-priorities
 
 echo Adding versionlock for xrootd:
-- 
GitLab