From 8bf553bbce894e3b4c8ac2c8ae7ec377678c24e3 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 14 Oct 2025 17:17:12 +0530 Subject: [PATCH] chore: fix conflicts --- .../doctype/stock_entry_detail/stock_entry_detail.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json index dc457892f86..cedf0872873 100644 --- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json +++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json @@ -616,11 +616,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-03-26 21:01:58.544797", -======= - "modified": "2025-10-14 14:10:38.373099", ->>>>>>> e7b64175fd (perf: optimize sql query) + "modified": "2025-10-14 15:10:38.373099", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry Detail",