From e6438b293dca68511ed83af18b1816379f0b244c Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 26 Aug 2024 15:30:53 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/accounts/doctype/bank_clearance/bank_clearance.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py index dd0b6bf812e..b361a1ebb82 100644 --- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py +++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py @@ -6,12 +6,7 @@ import frappe from frappe import _, msgprint from frappe.model.document import Document from frappe.query_builder.custom import ConstantColumn -<<<<<<< HEAD -from frappe.utils import flt, fmt_money, getdate -======= from frappe.utils import flt, fmt_money, get_link_to_form, getdate -from pypika import Order ->>>>>>> 092411b54f (refactor: better err msg on clearance tool) import erpnext