fix: resolved conflict

2024-02-26 12:21:57 +05:30
parent d196aa5a36
commit fc565ecd99
1 changed files with 0 additions and 3 deletions
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
@@ -148,10 +148,7 @@ class AssetCapitalization(StockController):
 	def cancel_target_asset(self):
 		if self.entry_type == "Capitalization" and self.target_asset:
 			asset_doc = frappe.get_doc("Asset", self.target_asset)
-<<<<<<< HEAD
-=======
 			asset_doc.db_set("capitalized_in", None)
->>>>>>> 17f85de6fb (fix: Issues regarding asset cancellation and deletion)
 			if asset_doc.docstatus == 1:
 				asset_doc.cancel()