summaryrefslogtreecommitdiff
path: root/indoteknik_custom/models
diff options
context:
space:
mode:
authorMqdd <ahmadmiqdad27@gmail.com>2026-02-14 11:14:22 +0700
committerMqdd <ahmadmiqdad27@gmail.com>2026-02-14 11:14:22 +0700
commit30e7aae41d50528a4e61e6f55f38e3dd647e41c6 (patch)
tree5dfafaa9573e0ed97209ea3204a41f577adfef57 /indoteknik_custom/models
parent472f36669375d3d0bcecf137e07260fac25d12b3 (diff)
<Miqdad> merge
Diffstat (limited to 'indoteknik_custom/models')
-rwxr-xr-xindoteknik_custom/models/__init__.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 2b1851ce..3b3dcd9d 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -165,8 +165,5 @@ from . import partial_delivery
from . import domain_apo
from . import uom_uom
from . import commission_internal
-<<<<<<< HEAD
from . import gudang_service
-=======
-from . import update_depreciation_move_wizard
->>>>>>> 37e0beac646ee2e676ff935e8289cf3189b3c21b
+from . import update_depreciation_move_wizard \ No newline at end of file