fix: Remove conflicts

2022-02-28 18:15:29 +05:30
parent ebf70a4b5d
commit ca6f196bad
1 changed files with 1 additions and 6 deletions
--- 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)
+