From bbe4bc1fc0eefc1fde9e5ecf73fb0bb0189e3e26 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Tue, 28 Dec 2021 19:10:27 +0530
Subject: [PATCH] fix: Resolve conflicts

---
 .../doctype/loan_repayment/loan_repayment.py             | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
index 903e7f828b6..151cf58965c 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
@@ -558,16 +558,7 @@ def get_amounts(amounts, against_loan, posting_date):
 		if due_date and not final_due_date:
 			final_due_date = add_days(due_date, loan_type_details.grace_period_in_days)
 
-<<<<<<< HEAD
-	if against_loan_doc.status in ('Disbursed', 'Closed') or against_loan_doc.disbursed_amount >= against_loan_doc.loan_amount:
-		pending_principal_amount = against_loan_doc.total_payment - against_loan_doc.total_principal_paid \
-			- against_loan_doc.total_interest_payable - against_loan_doc.written_off_amount
-	else:
-		pending_principal_amount = against_loan_doc.disbursed_amount - against_loan_doc.total_principal_paid \
-			- against_loan_doc.total_interest_payable - against_loan_doc.written_off_amount
-=======
 	pending_principal_amount = get_pending_principal_amount(against_loan_doc)
->>>>>>> dcae9ba86e (fix: Unsecured loan status update)
 
 	unaccrued_interest = 0
 	if due_date: