slapos_erp5: fixup rebase

a61aa484 · Romain Courteaud · 1ad6a2b8 · a61aa484
Commit a61aa484 authored Oct 27, 2023 by Romain Courteaud
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

master/bt5/slapos_erp5/bt/template_property_sheet_id_list master/bt5/slapos_erp5/bt/template_property_sheet_id_list +2 -3

No files found.
--- a/master/bt5/slapos_erp5/bt/template_property_sheet_id_list
+++ b/master/bt5/slapos_erp5/bt/template_property_sheet_id_list
 CatalogToolNoneCreationDateConstraint
 CertificateAuthorityToolConsistencyConstraint
-SlapOSModuleIdGeneratorConstraint
 GeographicOrganisation
-MemcachedToolServerConstraint
 OAuthToolDefaultSlapOSConnector
 PreferenceSlapOSConstraintPreference
 ShacacheSystemPreference
 SlapOSModuleIdGeneratorConstraint
+SlapOSModuleIdGeneratorConstraint
 TemplateToolBusinessApplicationModuleCategoryConstraint
-WebSiteModuleShacacheConstraint
+WebSiteModuleShacacheConstraint
\ No newline at end of file