From 697fdf5bc35853dc7c173de47dbc036e1d6efa35 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 17 Feb 2025 21:30:15 +0530 Subject: [PATCH] chore: fix conflicts --- .../doctype/stock_settings/stock_settings.json | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index 4b6d4f180e0..22a24d1bfa1 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -469,15 +469,6 @@ "fieldname": "allow_existing_serial_no", "fieldtype": "Check", "label": "Allow existing Serial No to be Manufactured/Received again" -<<<<<<< HEAD -======= - }, - { - "default": "0", - "description": "Upon submission of the Sales Order, Work Order, or Production Plan, the system will automatically reserve the stock.", - "fieldname": "auto_reserve_stock", - "fieldtype": "Check", - "label": "Auto Reserve Stock" }, { "fieldname": "serial_and_batch_bundle_section", @@ -489,7 +480,6 @@ "fieldname": "set_serial_and_batch_bundle_naming_based_on_naming_series", "fieldtype": "Check", "label": "Set Serial and Batch Bundle Naming Based on Naming Series" ->>>>>>> fe43975cdd (fix: provision to enable naming series for SABB) } ], "icon": "icon-cog", @@ -497,11 +487,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-12-09 17:52:36.030456", -======= - "modified": "2025-02-17 13:36:36.177743", ->>>>>>> fe43975cdd (fix: provision to enable naming series for SABB) + "modified": "2025-02-17 14:36:36.177743", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings",