From 52860cc56639ebdd8143e869300838ad1b8854ff Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 18 Feb 2025 14:27:14 +0530
Subject: [PATCH] chore: resolve conflict

---
 .../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 2df6dc3ea83..500a7657176 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -965,11 +965,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-11-21 14:21:29.743474",
-=======
  "modified": "2025-02-06 13:29:24.619850",
->>>>>>> 7d47869f4b (fix: add accounting dimensions section in sales order item)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order Item",