Skip to content
Snippets Groups Projects
Commit 650e1452 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Fixing conflicts

parent 206bd8ea
No related branches found
No related tags found
No related merge requests found
Pipeline #2327 failed
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
build.sh
+ 0
− 4
View file @ 650e1452
......@@ -23,11 +23,7 @@ echo "GPU compilation: $with_gpu"
if [ x"$hostname" == x"cifarm-centos-node.mpi-cbg.de" ]; then
echo "CentOS node"
<<<<<<< HEAD
source /opt/rh/devtoolset-8/enable
=======
source /opt/rh/devtoolset-7/enable
>>>>>>> master
fi
if [ x"$hostname" == x"cifarm-ubuntu-node" ]; then
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment