From 2317f6a0000843887d60b873d41de66efcbcc6c2 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 25 Oct 2023 11:27:51 +0530 Subject: [PATCH] chore: resolve conflict --- .../bank_reconciliation_tool/bank_reconciliation_tool.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py index 98b49f296d4..6017c5a491d 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py @@ -16,12 +16,8 @@ from erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_s get_amounts_not_reflected_in_system, get_entries, ) -<<<<<<< HEAD from erpnext.accounts.utils import get_balance_on -======= -from erpnext.accounts.utils import get_account_currency, get_balance_on from erpnext.setup.utils import get_exchange_rate ->>>>>>> 89f484282a (refactor: exc rate on foreign currency JE from Bank Reconciliation) class BankReconciliationTool(Document):