From e29a384f902e8e5a8bc563ce1752fc3cce452d1b Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Sat, 15 Nov 2025 19:39:40 +0100
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/setup/install.py                                  | 5 -----
 erpnext/setup/setup_wizard/operations/install_fixtures.py | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index fb09598a450..c7082122a15 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -6,7 +6,6 @@ import click
 import frappe
 from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
 from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
-from frappe.utils import cint
 
 import erpnext
 from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules
@@ -193,10 +192,6 @@ def add_company_to_session_defaults():
 
 def add_standard_navbar_items():
 	navbar_settings = frappe.get_single("Navbar Settings")
-<<<<<<< HEAD
-
-=======
->>>>>>> 9a989a84fb (fix: use dummy translations for custom field labels (#49875))
 	erpnext_navbar_items = [
 		{
 			"item_label": _("Documentation"),
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index 5c5d47730eb..758a05f0736 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -7,7 +7,6 @@ import os
 from pathlib import Path
 
 import frappe
-from frappe import _
 from frappe.desk.doctype.global_search_settings.global_search_settings import (
 	update_global_search_doctypes,
 )
@@ -16,10 +15,7 @@ from frappe.utils import cstr, getdate
 
 from erpnext.accounts.doctype.account.account import RootNotEditable
 from erpnext.regional.address_template.setup import set_up_address_templates
-<<<<<<< HEAD
-=======
 from erpnext.setup.utils import identity as _
->>>>>>> 9a989a84fb (fix: use dummy translations for custom field labels (#49875))
 
 
 def read_lines(filename: str) -> list[str]: