From e48e19b7167cad21ef780d7a2e2f5a6267f5399c Mon Sep 17 00:00:00 2001
From: Mqdd <ahmadmiqdad27@gmail.com>
Date: Wed, 11 Mar 2026 20:28:20 +0700
Subject: <Miqdad> fix merge error

---
 indoteknik_custom/models/sale_order.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indoteknik_custom')

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 185cee0d..294cd42d 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -4007,7 +4007,6 @@ class SaleOrder(models.Model):
             'target': 'current',
         }
 
-<<<<<<< HEAD
     def action_open_sjo(self):
         return {
         'name': 'SJO',
@@ -4019,7 +4018,6 @@ class SaleOrder(models.Model):
                 'default_so_id': self.id,
             }
         }
-=======
 class SaleForecastCoverage(models.Model):
     _name = 'sale.forecast.coverage'
     _description = 'Sale Forecast Coverage'
-- 
cgit v1.2.3