From edd143b0840eec5aaf1997bb303439b592904eac Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sun, 7 Apr 2024 12:15:52 +0530 Subject: [PATCH] fix: resolved merge conflict --- .../asset_depreciation_schedule.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py index fd94faa8cc9..f30489d9265 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py @@ -699,14 +699,10 @@ def get_straight_line_or_manual_depr_amount( ) ), add_days( -<<<<<<< HEAD - get_last_day(add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)), 1 -======= get_last_day( add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation) ), 1, ->>>>>>> be0cb5289f (fix:linter issue) ), ) + 1