From e8edbf3d6b2c2edd67a890a29fb6262794e730d9 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 2 Feb 2024 13:35:08 +0700 Subject: fix conflict --- indoteknik_custom/__manifest__.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indoteknik_custom/__manifest__.py') diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index 689103d8..b8a5f6f8 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -107,17 +107,9 @@ 'views/purchase_order_multi_update.xml', 'views/purchase_order_multi_confirm.xml', 'views/invoice_reklas_penjualan.xml', -<<<<<<< Updated upstream -<<<<<<< Updated upstream 'views/po_multi_cancel.xml', -======= 'views/logbook_sj.xml', 'views/report_logbook_sj.xml', ->>>>>>> Stashed changes -======= - 'views/logbook_sj.xml', - 'views/report_logbook_sj.xml', ->>>>>>> Stashed changes 'report/report.xml', 'report/report_banner_banner.xml', 'report/report_banner_banner2.xml', -- cgit v1.2.3