summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzka Nathan <darizkyfaz@gmail.com>2024-02-02 13:36:48 +0700
committerAzka Nathan <darizkyfaz@gmail.com>2024-02-02 13:36:48 +0700
commitf5edc62d22c9a3973261ad289a11e189f0866f52 (patch)
tree7ec624af233f17bce767be4b8b173ce19841bf34
parente8edbf3d6b2c2edd67a890a29fb6262794e730d9 (diff)
fix conflict
-rwxr-xr-xindoteknik_custom/models/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 9678329a..49e3567c 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -100,4 +100,4 @@ from . import purchase_order_multi_confirm
from . import stock_quant
from . import po_multi_cancel
from . import logbook_sj
-from . import report_logbook_sj \ No newline at end of file
+from . import report_logbook_sj