From 39a4760e07a8b107f0be8c09f50f20b7ea007e36 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 8 Apr 2026 12:29:00 +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 d089da00a49..8fda1c44702 100644 --- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -1148,11 +1148,7 @@ "idx": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-10-14 12:59:20.384056", -======= - "modified": "2026-04-07 15:40:47.032889", ->>>>>>> 90fd6f2e40 (fix: hardcoded precision causing decimal issues) + "modified": "2026-04-07 15:41:47.032889", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt Item",