From ca6f196badd0828d1b5d7411f49fccc603f6478d Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 28 Feb 2022 18:15:29 +0530
Subject: [PATCH] fix: Remove conflicts

---
 .../doctype/sales_invoice_item/sales_invoice_item.json     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 8e19bc928b6..5a095fbb7ea 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -850,11 +850,6 @@
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
-<<<<<<< HEAD
  "sort_order": "DESC"
 }
-=======
- "sort_order": "DESC",
- "states": []
-}
->>>>>>> 0373914704 (fix: Commission not applied while making Sales Order from Quotation)
+