From ad3f985dc41ebf7309c7e4890545b62829c32ea1 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Wed, 26 Mar 2025 22:11:43 +0530
Subject: [PATCH] chore: fix conflicts

(cherry picked from commit 41f20a9c642ab3a634b4c0fc1b8ecf194b019e56)
---
 .../stock_entry_detail/stock_entry_detail.json        | 11 +----------
 1 file changed, 1 insertion(+), 10 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 dec8d575077..9824911404e 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -613,23 +613,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-02-25 15:58:40.982582",
-=======
- "modified": "2025-03-26 21:00:58.544797",
->>>>>>> 5ddb36af87 (fix: slow query)
+ "modified": "2025-03-26 21:01:58.544797",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry Detail",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> 5ddb36af87 (fix: slow query)
  "sort_order": "ASC",
  "states": []
 }