From ea7c82c6a3cb5e03cd54240350365520b6569df9 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Thu, 15 Aug 2024 13:12:38 +0530
Subject: [PATCH] chore: resolved conflicts

---
 .../asset_capitalization.js                   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
index e8f641f434d..6f73dfc6736 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
@@ -64,25 +64,6 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
 			};
 		});
 
-<<<<<<< HEAD
-=======
-		me.frm.set_query("serial_and_batch_bundle", "stock_items", (doc, cdt, cdn) => {
-			let row = locals[cdt][cdn];
-			return {
-				filters: {
-					item_code: row.item_code,
-					voucher_type: doc.doctype,
-					voucher_no: ["in", [doc.name, ""]],
-					is_cancelled: 0,
-				},
-			};
-		});
-
-<<<<<<< HEAD
-
->>>>>>> 2fd8de2f76 (fix: set up filters for dimensions)
-=======
->>>>>>> 0d42793397 (chore: linters check)
 		me.frm.set_query("item_code", "stock_items", function () {
 			return erpnext.queries.item({ is_stock_item: 1 });
 		});