From 4095a3dae2e21a24b73b7c0a68aebec94ca9d944 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 26 Aug 2022 18:10:09 +0530 Subject: [PATCH] chore: Resolve conflicts --- .../doctype/sales_invoice_item/sales_invoice_item.json | 4 ---- 1 file changed, 4 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 9734e850a0c..7bb564b066a 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -841,11 +841,7 @@ "idx": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2022-02-24 14:41:36.392560", -======= "modified": "2022-08-26 12:06:31.205417", ->>>>>>> c42fef541a (chore: remove precision on discount_percentage of Sales Invoice Item) "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item",