From dbd466b6b2afdff4a1b3816359cab55207c44318 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Sat, 17 Aug 2024 02:24:58 +0200 Subject: [PATCH] chore: resolve conflicts --- erpnext/controllers/accounts_controller.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index ad9bafc93c0..58e120e14b0 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -233,13 +233,8 @@ class AccountsController(TransactionBase): ).format( frappe.bold(document_type), get_link_to_form(self.doctype, self.get("return_against")), -<<<<<<< HEAD - frappe.bold("Update Outstanding for Self"), - get_link_to_form("Payment Reconciliation", "Payment Reconciliation"), -======= frappe.bold(_("Update Outstanding for Self")), - get_link_to_form("Payment Reconciliation"), ->>>>>>> af0ae930ca (fix: translatability of boldened text) + get_link_to_form("Payment Reconciliation", "Payment Reconciliation"), ) )