Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Rafael Monnerat
slapos.core
Commits
36fa680b
Commit
36fa680b
authored
Aug 02, 2024
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_erp5: Fixup coding style
Conflict resolution in git added a new line while editing the file
parent
44443358
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
master/bt5/slapos_erp5/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
...rtalTypePropertySheetTemplateItem/property_sheet_list.xml
+1
-1
master/bt5/slapos_erp5/bt/template_portal_type_property_sheet_list
...5/slapos_erp5/bt/template_portal_type_property_sheet_list
+1
-1
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
+1
-1
No files found.
master/bt5/slapos_erp5/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @
36fa680b
...
@@ -27,4 +27,4 @@
...
@@ -27,4 +27,4 @@
<portal_type
id=
"Web Site Module"
>
<portal_type
id=
"Web Site Module"
>
<item>
WebSiteModuleShacacheConstraint
</item>
<item>
WebSiteModuleShacacheConstraint
</item>
</portal_type>
</portal_type>
</property_sheet_list>
</property_sheet_list>
\ No newline at end of file
master/bt5/slapos_erp5/bt/template_portal_type_property_sheet_list
View file @
36fa680b
...
@@ -9,4 +9,4 @@ Invitation Token | Url
...
@@ -9,4 +9,4 @@ Invitation Token | Url
Organisation | GeographicOrganisation
Organisation | GeographicOrganisation
Template Tool | TemplateToolBusinessApplicationModuleCategoryConstraint
Template Tool | TemplateToolBusinessApplicationModuleCategoryConstraint
Template Tool | TemplateToolPASConsistencyConstraint
Template Tool | TemplateToolPASConsistencyConstraint
Web Site Module | WebSiteModuleShacacheConstraint
Web Site Module | WebSiteModuleShacacheConstraint
\ No newline at end of file
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
View file @
36fa680b
...
@@ -6,4 +6,4 @@ ShacacheSystemPreference
...
@@ -6,4 +6,4 @@ ShacacheSystemPreference
SlapOSModuleIdGeneratorConstraint
SlapOSModuleIdGeneratorConstraint
TemplateToolBusinessApplicationModuleCategoryConstraint
TemplateToolBusinessApplicationModuleCategoryConstraint
TemplateToolPASConsistencyConstraint
TemplateToolPASConsistencyConstraint
WebSiteModuleShacacheConstraint
WebSiteModuleShacacheConstraint
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment