Fixed failed merge in buildtree scripts.

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: