slapos_erp5: fixup rebase

e89c2f37 · Romain Courteaud · 2f6d002e · e89c2f37
Commit e89c2f37 authored Sep 25, 2023 by Romain Courteaud
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

master/bt5/slapos_erp5/bt/template_test_id_list master/bt5/slapos_erp5/bt/template_test_id_list +3 -4

No files found.
--- a/master/bt5/slapos_erp5/bt/template_test_id_list
+++ b/master/bt5/slapos_erp5/bt/template_test_id_list
@@ -8,11 +8,10 @@ test.erp5.testSlapOSERP5InteractionWorkflow
 test.erp5.testSlapOSERP5LocalPermissionSlapOSInteractionWorkflow
 test.erp5.testSlapOSERP5SiteDump
 test.erp5.testSlapOSERP5SkinSelection
-test.erp5.testSlapOSPrecacheManifest
-test.erp5.testSlapOSWendelinCoreTwo
-test.erp5.testSlapOSXHTML
-test.erp5.testSlapOSERP5VirtualMasterInvoicingScenario
 test.erp5.testSlapOSERP5VirtualMasterScenario
 test.erp5.testSlapOSPrecacheManifest
+test.erp5.testSlapOSPrecacheManifest
+test.erp5.testSlapOSWendelinCoreTwo
 test.erp5.testSlapOSWendelinCoreTwo
 test.erp5.testSlapOSXHTML
+test.erp5.testSlapOSXHTML
\ No newline at end of file