From 572af6e08a06698c9874a31fe657693e8d4d262b Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 15 Sep 2025 15:43:38 +0530 Subject: [PATCH] chore: fix conflicts --- .../serial_and_batch_bundle/serial_and_batch_bundle.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json index 5dc59718d0b..0a24bfb5645 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json +++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json @@ -256,11 +256,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-02-17 18:22:36.056205", -======= "modified": "2025-09-15 14:37:26.441742", ->>>>>>> 335dcc976c (fix: do not allow backdated entries if stock reco exists in future for serial or batch) "modified_by": "Administrator", "module": "Stock", "name": "Serial and Batch Bundle",