From 55a8c1e5b204bd19733f3197b253293bc00fdf32 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Fri, 13 Feb 2026 09:42:10 +0700 Subject: fix conflict --- indoteknik_custom/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index b2e94858..6287aace 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -194,7 +194,7 @@ 'views/domain_apo.xml', 'views/uom_uom.xml', 'views/commission_internal.xml', - 'views/gudang_service.xml' + 'views/gudang_service.xml', 'views/update_depreciation_move_wizard_view.xml' ], 'demo': [], -- cgit v1.2.3