summaryrefslogtreecommitdiff
path: root/indoteknik_custom/__manifest__.py
diff options
context:
space:
mode:
authorRafi Zadanly <zadanlyr@gmail.com>2023-06-15 16:48:29 +0700
committerRafi Zadanly <zadanlyr@gmail.com>2023-06-15 16:48:29 +0700
commitbc6bc85f455c4b8bc9f73b779b521faa5fcdcf96 (patch)
tree08c434bd0d6935945c95c81eae29b3b4c8aacafb /indoteknik_custom/__manifest__.py
parent55c67c71b04fce80c635b3a58d91c8bcb02e17c8 (diff)
Update user cart model and API
Diffstat (limited to 'indoteknik_custom/__manifest__.py')
-rwxr-xr-xindoteknik_custom/__manifest__.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index f21fab0c..7b029a05 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -74,15 +74,12 @@
'views/procurement_monitoring_detail.xml',
'views/product_product.xml',
'views/brand_vendor.xml',
-<<<<<<< HEAD
'views/promotion_program.xml',
'views/promotion_program_line.xml',
'views/promotion_program_free_item.xml',
'views/promotion_program_keyword.xml',
-=======
'views/requisition.xml',
'views/landedcost.xml',
->>>>>>> 24649f8e939484759ef34e5e68f251d951f63c02
'report/report.xml',
'report/report_banner_banner.xml',
'report/report_banner_banner2.xml',