diff options
| author | Azka Nathan <darizkyfaz@gmail.com> | 2024-02-02 13:35:08 +0700 |
|---|---|---|
| committer | Azka Nathan <darizkyfaz@gmail.com> | 2024-02-02 13:35:08 +0700 |
| commit | e8edbf3d6b2c2edd67a890a29fb6262794e730d9 (patch) | |
| tree | 63c36a17222088f7deb421edb9095499b4399bc8 /indoteknik_custom/__manifest__.py | |
| parent | 8978868864925683d02342112020e7fc047a4acf (diff) | |
fix conflict
Diffstat (limited to 'indoteknik_custom/__manifest__.py')
| -rwxr-xr-x | indoteknik_custom/__manifest__.py | 8 |
1 files changed, 0 insertions, 8 deletions
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', |