From 47a9325177325b12e893f4c67156752a4a814b41 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:31:56 +0530
Subject: [PATCH] chore: linters check

(cherry picked from commit 0d427933974c67a966edb4ba4aba0a422c49088a)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
---
 .../doctype/asset_capitalization/asset_capitalization.js       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
index a99b6405f7c..e8f641f434d 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
@@ -78,8 +78,11 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
 			};
 		});
 
+<<<<<<< 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 });
 		});