From 8fc705ea6a92de51abeffc73f5c2cd2d787e981b Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 9 Oct 2023 15:17:15 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/accounts/doctype/payment_entry/payment_entry.js | 4 ---- erpnext/public/js/erpnext.bundle.js | 4 ---- 2 files changed, 8 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 48a18e95b7a..d5b047389ed 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -152,11 +152,7 @@ frappe.ui.form.on('Payment Entry', { frm.events.hide_unhide_fields(frm); frm.events.set_dynamic_labels(frm); frm.events.show_general_ledger(frm); -<<<<<<< HEAD -======= - erpnext.accounts.ledger_preview.show_accounting_ledger_preview(frm); erpnext.accounts.unreconcile_payments.add_unreconcile_btn(frm); ->>>>>>> 25fe752185 (chore: move functions to a separate file in utils) }, validate_company: (frm) => { diff --git a/erpnext/public/js/erpnext.bundle.js b/erpnext/public/js/erpnext.bundle.js index 5df6318a1cd..730ee23173d 100644 --- a/erpnext/public/js/erpnext.bundle.js +++ b/erpnext/public/js/erpnext.bundle.js @@ -18,11 +18,7 @@ import "./utils/customer_quick_entry"; import "./utils/supplier_quick_entry"; import "./call_popup/call_popup"; import "./utils/dimension_tree_filter"; -<<<<<<< HEAD -======= -import "./utils/ledger_preview.js"; import "./utils/unreconcile.js"; ->>>>>>> 25fe752185 (chore: move functions to a separate file in utils) import "./utils/barcode_scanner"; import "./telephony"; import "./templates/call_link.html";