From dff76a1f07442db0ccb82e0f0477fb7e688baf4b Mon Sep 17 00:00:00 2001 From: Packeting <127834955+Packeting1@users.noreply.github.com> Date: Sun, 4 Jan 2026 10:45:24 +0800 Subject: [PATCH] fix: clean merge artifacts --- frappe/public/js/frappe/form/print_utils.js | 6 ------ frappe/public/js/frappe/form/tab.js | 8 -------- 2 files changed, 14 deletions(-) diff --git a/frappe/public/js/frappe/form/print_utils.js b/frappe/public/js/frappe/form/print_utils.js index 2b6e30ea2f..bcb0e36641 100644 --- a/frappe/public/js/frappe/form/print_utils.js +++ b/frappe/public/js/frappe/form/print_utils.js @@ -95,13 +95,7 @@ frappe.ui.get_print_settings = function ( settings.letter_head_name = null; } else { const letter_head_name = -<<<<<<< HEAD settings.letter_head || settings.letter_head_name || print_settings.letter_head; -======= - settings.letter_head || - settings.letter_head_name || - print_settings.letter_head; ->>>>>>> b1263e2604 (fix: render report letterhead jinja on print/pdf) if (letter_head_name) { settings.letter_head_name = letter_head_name; settings.letter_head = frappe.boot.letter_heads[letter_head_name]; diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js index 462cb2c8e2..954e3dd64c 100644 --- a/frappe/public/js/frappe/form/tab.js +++ b/frappe/public/js/frappe/form/tab.js @@ -35,14 +35,6 @@ export default class Tab { type="button" role="tab" aria-controls="${id}"> -<<<<<<< HEAD - ${ - ICON_MAP[this.label] || this.df.icon - ? frappe.utils.icon(this.df.icon || ICON_MAP[this.label]) - : "" - } -======= ->>>>>>> 19cdf236bc (fix: remove icon from form tabs) ${__(this.label, null, this.doctype)}