From 66ee208cb2d63dd5052e8a7017dcdd8c968af248 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Mon, 6 Apr 2026 16:19:53 +0530
Subject: [PATCH] fix: conflicts

---
 .../selling/doctype/sales_order_item/sales_order_item.json    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index af82501dec1..0f043a73fa4 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -1035,11 +1035,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-02-21 16:39:00.200328",
-=======
  "modified": "2026-02-22 16:40:00.200328",
->>>>>>> 8f83616b60 (fix: print hide unnecessary fields)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order Item",