From e8047ab2cab4b7cd694dabdbb984a54f09b27c74 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Tue, 18 Mar 2025 12:01:11 +0530
Subject: [PATCH] chore: fix conflicts

---
 erpnext/stock/doctype/item_default/item_default.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/stock/doctype/item_default/item_default.json b/erpnext/stock/doctype/item_default/item_default.json
index 61d9ef49dec..04212b31795 100644
--- a/erpnext/stock/doctype/item_default/item_default.json
+++ b/erpnext/stock/doctype/item_default/item_default.json
@@ -140,11 +140,7 @@
  ],
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-09-04 12:33:14.607267",
-=======
  "modified": "2025-03-17 13:46:09.719105",
->>>>>>> d758fde881 (fix: performance issue for item list view)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Default",
@@ -155,4 +151,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}