From 967ee7841545fe81cbeebd36f94a9f8f091cde16 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 14 Oct 2025 13:33:24 +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 4db7d9efcd8..7acb36eca93 100644 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -984,11 +984,7 @@ "idx": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-03-12 16:33:13.453290", -======= - "modified": "2025-10-14 13:00:54.441511", ->>>>>>> 1afc75b15a (fix: performance issue by adding index) + "modified": "2025-10-14 13:01:54.441511", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item",