From d576fc7490145bd7540f25ab19635754a05c80ad Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 24 Oct 2023 08:48:53 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/accounts/utils.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 5c371517470..53e1c1d76dc 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -624,12 +624,7 @@ def update_reference_in_payment_entry(
 		"outstanding_amount": d.outstanding_amount,
 		"allocated_amount": d.allocated_amount,
 		"exchange_rate": d.exchange_rate if d.exchange_gain_loss else payment_entry.get_exchange_rate(),
-<<<<<<< HEAD
-		"exchange_gain_loss": d.exchange_gain_loss,  # only populated from invoice in case of advance allocation
-=======
 		"exchange_gain_loss": d.exchange_gain_loss,
-		"account": d.account,
->>>>>>> 23df4205f8 (fix: overallocation on Payment with PO/SO)
 	}
 
 	if d.voucher_detail_no: