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/models/__init__.py | |
| parent | 8978868864925683d02342112020e7fc047a4acf (diff) | |
fix conflict
Diffstat (limited to 'indoteknik_custom/models/__init__.py')
| -rwxr-xr-x | indoteknik_custom/models/__init__.py | 10 |
1 files changed, 1 insertions, 9 deletions
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 |