X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=devops-stages%2Fstage-build.sh;h=88182897b96fbd1159b76f76985b7d1da9ea8a63;hb=refs%2Ftags%2Fv12.0.2;hp=2cd46899e544fc133d9bb92c9d624e12685c2b1d;hpb=be457679612150ae0d21d10d2e1becc512f8b7b4;p=osm%2FRO.git

diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
index 2cd46899..88182897 100755
--- a/devops-stages/stage-build.sh
+++ b/devops-stages/stage-build.sh
@@ -37,14 +37,9 @@ dist_ro_vim_vmware
 dist_ro_vim_gcp"
 
 TOX_ENV_LIST="$(echo $PACKAGES | sed "s/ /,/g")"
-<<<<<<< ours
-
-TOX_PARALLEL_NO_SPINNER=1 tox -e $TOX_ENV_LIST --parallel auto
-=======
 PROCESSES=$(expr `nproc --a` / 2)
 
 TOX_PARALLEL_NO_SPINNER=1 tox -e $TOX_ENV_LIST --parallel $PROCESSES
->>>>>>> theirs
 
 # Copying packages
 # RO plugin