From 9eeddc28b01825544d12e894703f10d5b211e073 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Tue, 1 Feb 2022 12:15:48 +0530
Subject: [PATCH] fix: Merge conflict inconsistency due to
 https://github.com/frappe/erpnext/pull/27931

---
 erpnext/templates/includes/macros.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index 889cf1ab38..4741307737 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -342,12 +342,12 @@
 				<label data-value="{{ attr_value }}">
 					<input type="checkbox"
 						class="product-filter attribute-filter"
-						id="{{attr_value.name}}"
+						id="{{ attr_value }}"
 						data-attribute-name="{{ attribute.name }}"
-						data-attribute-value="{{ attr_value.attribute_value }}"
+						data-attribute-value="{{ attr_value }}"
 						style="width: 14px !important"
 						{% if attr_value.checked %} checked {% endif %}>
-						<span class="label-area">{{ attr_value.attribute_value }}</span>
+						<span class="label-area">{{ attr_value }}</span>
 				</label>
 			</div>
 			{% endfor %}