From 61f7309695ca05342423d3df552b9f2fcc28756c Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 14 Oct 2025 13:33:56 +0530 Subject: [PATCH] chore: fix conflicts --- .../purchase_receipt_item/purchase_receipt_item.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json index 0747fba0035..463544a9952 100644 --- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -1149,11 +1149,7 @@ "idx": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-03-12 17:10:43.780622", -======= - "modified": "2025-10-14 12:58:20.384056", ->>>>>>> 1afc75b15a (fix: performance issue by adding index) + "modified": "2025-10-14 12:59:20.384056", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt Item",