DELETEME: temporary disable all other tests

software/slapos-sr-testing/software.cfg

@@ -255,6 +255,7 @@ tests =
   ${slapos.test.kvm-setup:setup}
   ${slapos.test.slaprunner-setup:setup}
   ${slapos.test.metabase-setup:setup}
+  ${slapos.test.proviewr-setup:setup}
   ${:extra}
 extra =
   ${slapos.cookbook-setup:setup}
@@ -266,6 +267,7 @@ 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}
@@ -278,6 +280,8 @@ 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