Fix pull

component/proviewR/buildout.cfg

@@ -283,13 +283,9 @@ environment =
 
 [pwr]
 recipe = slapos.recipe.cmmi
-#url = https://github.com/Houkime/proview/archive/9781958a8387bbd3f22cfd5a499759fa0af26d72.zip
-#md5sum = ae97a277baf07ebb48c2e280740485ba
 url = https://lab.nexedi.com/esteban.blanc/proview/-/archive/slapos-adapt/proview-slapos-adapt.tar.gz
 md5sum = 6e082d01914880605eb30da61d8a0831
-#url = https://lab.nexedi.com/esteban.blanc/proview/-/archive/slapos-adapt-release/proview-slapos-adapt-release.tar.gz
-#md5sum = 663942b93fe8a9e157006c350d74ee23
-version = 663942b93fe8a9e157006c350d74ee23
+version = 6e082d01914880605eb30da61d8a0831
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 aroot=${:location}/local/adm
 keep-compile-dir = true

software/slapos-sr-testing/software.cfg

-[buildout]
 
 extends =
   ../../component/bcrypt/buildout.cfg
@@ -267,7 +266,6 @@ extra =
   ${slapos.test.plantuml-setup:setup}
   ${slapos.test.powerdns-setup:setup}
   ${slapos.test.proftpd-setup:setup}
-<<<<<<< HEAD
   ${slapos.test.proviewr-setup:setup}
   ${slapos.test.re6stnet-setup:setup}
   ${slapos.test.seleniumserver-setup:setup}
@@ -280,8 +278,6 @@ extra =
   ${slapos.test.gitlab-setup:setup}
   ${slapos.test.cloudooo-setup:setup}
   ${slapos.test.dream-setup:setup}
-=======
->>>>>>> DELETEME: temporary disable all other tests
 
 [versions]
 # slapos.core is used from the clone always