From 39f8d354143b14e37ff9444b95b7a84c9d538c8d Mon Sep 17 00:00:00 2001
From: diptanilsaha <diptanil@frappe.io>
Date: Thu, 26 Feb 2026 16:44:17 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/stock/doctype/item/item_list.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js
index b87ec37e39d..e8d886a9c24 100644
--- a/erpnext/stock/doctype/item/item_list.js
+++ b/erpnext/stock/doctype/item/item_list.js
@@ -1,11 +1,14 @@
-<<<<<<< HEAD
 frappe.listview_settings["Item"] = {
-	add_fields: ["item_name", "stock_uom", "item_group", "image", "has_variants", "end_of_life", "disabled"],
-=======
-frappe.listview_settings['Item'] = {
-	add_fields: ["item_name", "stock_uom", "item_group", "image",
-		"has_variants", "end_of_life", "disabled", "variant_of"],
->>>>>>> 9ea963bfe9 (fix: Variant Items, List View Enabled to Variant Status Change (#38468))
+	add_fields: [
+		"item_name",
+		"stock_uom",
+		"item_group",
+		"image",
+		"has_variants",
+		"end_of_life",
+		"disabled",
+		"variant_of",
+	],
 	filters: [["disabled", "=", "0"]],
 
 	get_indicator: function (doc) {