From fa7675488d1fbbd44d8fffbdd804d8577fa7b439 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 11 Apr 2025 20:26:43 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/stock_settings/stock_settings.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index e62a1159a8b..ce0ff8c2f9b 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -509,11 +509,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-03-31 15:34:20.752065", -======= "modified": "2025-04-11 18:56:35.781929", ->>>>>>> 00b25537f4 (fix: removed display depends on) "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings",