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

fix merge conflict in bemade_fsm manifest

Browse source
This commit is contained in:
Marc Durepos 2024-03-21 07:32:12 -04:00
parent 75ca67c533
commit 6d9d952982
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,12 +52,7 @@
'views/menus.xml',
'views/task_views.xml',
'views/sale_order_views.xml',
<<<<<<< HEAD
# BV: need to readd this file
# 'reports/worksheet_custom_report_templates.xml',
=======
'reports/worksheet_custom_report_templates.xml',
>>>>>>> origin/16.0
'reports/worksheet_custom_reports.xml',
'wizard/new_task_from_template.xml',
],