From 2b854377b15a2a701480baf5ec85010cd5ef0061 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 31 Mar 2025 20:43:34 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/stock_settings/stock_settings.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index b416bb83aed..551104688a2 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -510,11 +510,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-02-28 16:08:35.938840", -======= "modified": "2025-03-31 15:34:20.752065", ->>>>>>> b1dfbbe85e (feat: allow UOMs to select for which converstion rate defined in item master) "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings", @@ -535,12 +531,7 @@ } ], "quick_entry": 1, -<<<<<<< HEAD - "sort_field": "modified", -======= - "row_format": "Dynamic", "sort_field": "creation", ->>>>>>> b1dfbbe85e (feat: allow UOMs to select for which converstion rate defined in item master) "sort_order": "ASC", "states": [], "track_changes": 1