TechnoLibre/bemade-addons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed conflict stuff from bemade_fsm manifest

Browse source
This commit is contained in:
Marc Durepos 2024-01-15 09:07:39 -05:00
parent e596923100
commit 0f1b45ca81
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bemade_fsm/__manifest__.py
View file

@ -52,13 +52,8 @@
'views/menus.xml', 'views/menus.xml',
'views/task_views.xml', 'views/task_views.xml',
'views/sale_order_views.xml', 'views/sale_order_views.xml',
<<<<<<< HEAD
'reports/worksheet_custom_report_templates.xml', 'reports/worksheet_custom_report_templates.xml',
'reports/worksheet_custom_reports.xml', 'reports/worksheet_custom_reports.xml',
=======
# 'reports/worksheet_custom_report_templates.xml',
# 'reports/worksheet_custom_reports.xml',
>>>>>>> 5a006ec3
'wizard/new_task_from_template.xml', 'wizard/new_task_from_template.xml',
], ],
'assets': { 'assets': {