From 21607f39c5f0e644011faae52bd3a1508a05bfbf Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 8 Apr 2026 14:05:04 +0530 Subject: [PATCH] chore: fix conflicts --- .../purchase_invoice_item/purchase_invoice_item.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json index a691f8cad93..e059777dde2 100644 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -983,11 +983,7 @@ "idx": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-10-14 13:01:54.441511", -======= - "modified": "2026-04-07 15:40:45.687554", ->>>>>>> 90fd6f2e40 (fix: hardcoded precision causing decimal issues) + "modified": "2026-04-07 15:41:45.687554", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item",