From 0f774f2f07b8517e2be8ea422bf22e58f4624763 Mon Sep 17 00:00:00 2001
From: Marica <maricadsouza221197@gmail.com>
Date: Tue, 22 Mar 2022 15:39:36 +0530
Subject: [PATCH] fix: Merge conflicts in macros

- Use `filter-lookup-wrapper` on checkbox wrapper
- Bind data value to wrapper
---
 erpnext/templates/includes/macros.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index 666b5579f7f..fb4cecf8266 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -338,13 +338,8 @@
 		{% if attribute.item_attribute_values %}
 		<div class="filter-options">
 			{% for attr_value in attribute.item_attribute_values %}
-<<<<<<< HEAD
-			<div class="checkbox">
-				<label>
-=======
 			<div class="filter-lookup-wrapper checkbox" data-value="{{ attr_value }}">
 				<label data-value="{{ attr_value }}">
->>>>>>> f6e64c2cac (fix: Product Filters Lookup)
 					<input type="checkbox"
 						class="product-filter attribute-filter"
 						id="{{ attr_value }}"