From 4a8465df9078b29bdbc72144e612e1e2edfb06fd Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 5 Aug 2025 16:05:54 +0530
Subject: [PATCH] chore: resolved conflicts

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

diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index 8f26188e01a..a0681cc2c56 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -276,15 +276,10 @@ def _make_journal_entry_for_depreciation(
 	je.naming_series = depreciation_series
 	je.posting_date = depr_schedule.schedule_date
 	je.company = asset.company
-<<<<<<< HEAD
 	je.finance_book = asset_depr_schedule_doc.finance_book
-	je.remark = f"Depreciation Entry against {asset.name} worth {depr_schedule.depreciation_amount}"
-=======
-	je.finance_book = depr_schedule_doc.finance_book
 	je.remark = _("Depreciation Entry against {0} worth {1}").format(
 		asset.name, depr_schedule.depreciation_amount
 	)
->>>>>>> 803180d5de (chore: add translation function on remark in setup_journal_entry_metadata in depreciation.py)
 
 	credit_entry = {
 		"account": credit_account,