From 22e63099eedd97319cc96a689806668fdffbf2a6 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 6 Aug 2025 22:24:45 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/purchase_receipt/purchase_receipt.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 5e6f4287554..e2eec2e5085 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -1243,11 +1243,7 @@ "idx": 261, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-11-13 16:55:14.129055", -======= "modified": "2025-08-06 16:41:02.690658", ->>>>>>> c433943c46 (fix: timeout while submitting purchase receipt) "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt",