From 811953b9b0c74571c2f3b0ebcad57b16109e8a70 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Sun, 23 Feb 2025 19:47:06 +0530
Subject: [PATCH] chore: fix conflicts

---
 .../doctype/inventory_dimension/inventory_dimension.py   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
index 4574e95c4d0..ecc726fd86c 100644
--- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
+++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
@@ -196,18 +196,17 @@ class InventoryDimension(Document):
 			custom_fields["Stock Ledger Entry"] = dimension_field
 
 		filter_custom_fields = {}
-<<<<<<< HEAD
-=======
+
 		ignore_doctypes = [
-			"Serial and Batch Bundle",
-			"Serial and Batch Entry",
 			"Pick List Item",
 			"Maintenance Visit Purpose",
 		]
 
->>>>>>> cd4ba69262 (fix: inventory dimension for maintence visit)
 		if custom_fields:
 			for doctype, fields in custom_fields.items():
+				if doctype in ignore_doctypes:
+					continue
+
 				if isinstance(fields, dict):
 					fields = [fields]