From b9c326e3f63d70851e28c4f8c4dc962ba0083c36 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Mon, 2 May 2022 11:16:48 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/selling/doctype/sales_order/sales_order.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 13ef29b7d4c..6bcc8f05ac3 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1547,11 +1547,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-04-21 08:16:48.316074",
-=======
  "modified": "2022-04-26 14:38:18.350207",
->>>>>>> 82a0635c66 (fix: Consistent accounting dimensions across Sales and Purchase docs)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
@@ -1630,4 +1626,4 @@
  "title_field": "customer_name",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}