fix: resolved merge conflict

2024-04-07 12:15:52 +05:30
parent 0cd94b017f
commit edd143b084
1 changed files with 0 additions and 4 deletions
--- 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