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/models/__init__.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'indoteknik_custom/models/__init__.py') diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py index 4b29e71d..9678329a 100755 --- a/indoteknik_custom/models/__init__.py +++ b/indoteknik_custom/models/__init__.py @@ -98,14 +98,6 @@ from . import purchase_order_multi_update from . import invoice_reklas_penjualan from . import purchase_order_multi_confirm from . import stock_quant -<<<<<<< Updated upstream -<<<<<<< Updated upstream from . import po_multi_cancel -======= from . import logbook_sj -from . import report_logbook_sj ->>>>>>> Stashed changes -======= -from . import logbook_sj -from . import report_logbook_sj ->>>>>>> Stashed changes +from . import report_logbook_sj \ No newline at end of file -- cgit v1.2.3