From cfab9568112653c94b69fdb306e677c3ac7b7987 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 16 Jul 2024 22:46:54 +0530
Subject: [PATCH] chore: resolved conflicts

---
 erpnext/assets/doctype/asset/asset.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 864b0ebf0dd..e69fb728520 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -161,11 +161,7 @@ class Asset(AccountsController):
 	def on_cancel(self):
 		self.validate_cancellation()
 		self.cancel_movement_entries()
-<<<<<<< HEAD
-		self.cancel_capitalization()
-=======
 		self.reload()
->>>>>>> 81e0b96c30 (fix: service item capitalization (#42188))
 		self.delete_depreciation_entries()
 		cancel_asset_depr_schedules(self)
 		self.set_status()
@@ -527,19 +523,6 @@ class Asset(AccountsController):
 			movement = frappe.get_doc("Asset Movement", movement.get("name"))
 			movement.cancel()
 
-<<<<<<< HEAD
-	def cancel_capitalization(self):
-		asset_capitalization = frappe.db.get_value(
-			"Asset Capitalization",
-			{"target_asset": self.name, "docstatus": 1, "entry_type": "Capitalization"},
-		)
-
-		if asset_capitalization:
-			asset_capitalization = frappe.get_doc("Asset Capitalization", asset_capitalization)
-			asset_capitalization.cancel()
-
-=======
->>>>>>> 81e0b96c30 (fix: service item capitalization (#42188))
 	def delete_depreciation_entries(self):
 		if self.calculate_depreciation:
 			for row in self.get("finance_books"):