From 4094fbd6c5f970f0bd8d8b2a659f8b9a48fab979 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 12 Feb 2025 10:21:44 +0530 Subject: [PATCH] chore: fix conflicts --- .../serial_and_batch_bundle/serial_and_batch_bundle.json | 8 ++------ 1 file changed, 2 insertions(+), 6 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 4cb32bc3f6a..3ff76ee818b 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 @@ -247,11 +247,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-03-15 15:22:24.003486", -======= - "modified": "2025-02-12 09:53:32.090309", ->>>>>>> a007dc285d (fix: changed naming series to random for SABB) + "modified": "2025-02-12 10:53:32.090309", "modified_by": "Administrator", "module": "Stock", "name": "Serial and Batch Bundle", @@ -389,4 +385,4 @@ "sort_order": "DESC", "states": [], "title_field": "item_code" -} \ No newline at end of file +}