From 5e1d3f77bbf813a43c52dfa98b92e711a6275651 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 11 Apr 2025 15:35:36 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/stock_settings/stock_settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index 4681fab3d4d..2304359ab00 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -64,7 +64,6 @@ "naming_series_prefix", "stock_reservation_tab", "enable_stock_reservation", - "auto_reserve_stock", "column_break_rx3e", "allow_partial_reservation", "auto_reserve_stock_for_sales_order_on_purchase",