From 292f17b1b0d2c65e93f7410df5fd96072f1ef1c6 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 6 Feb 2026 12:12:59 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/selling/doctype/sales_order/sales_order.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index c2667d2eb21..4bbdb20d311 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -1671,11 +1671,7 @@ "idx": 105, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-07-28 12:14:29.760988", -======= "modified": "2026-02-06 11:06:16.092658", ->>>>>>> 1a22e3cb61 (fix: enabling skip delivery option for order type maintenance) "modified_by": "Administrator", "module": "Selling", "name": "Sales Order",