From 93fed0ce86b91c97e25dfd0685b657b47029290b Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sat, 1 Mar 2025 12:53:44 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/stock_settings/stock_settings.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index 282539c9d90..1987bc8642d 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -497,11 +497,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-02-17 14:36:36.177743", -======= - "modified": "2025-02-28 15:08:35.938840", ->>>>>>> 93f461c6f3 (fix: rearrange stock settings fields) + "modified": "2025-02-28 16:08:35.938840", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings",