From 335a78decdb2fcad40a546f9dd8409fc39698be7 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Wed, 26 Aug 2026 04:38:18 +0200
Subject: [PATCH] chore: resolve conflict

---
 .../migrate_asset_type_checkboxes_to_select.py     | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/erpnext/patches/v16_0/migrate_asset_type_checkboxes_to_select.py b/erpnext/patches/v16_0/migrate_asset_type_checkboxes_to_select.py
index 9a5c8398df0..897f25519f1 100644
--- a/erpnext/patches/v16_0/migrate_asset_type_checkboxes_to_select.py
+++ b/erpnext/patches/v16_0/migrate_asset_type_checkboxes_to_select.py
@@ -3,19 +3,6 @@ from frappe.query_builder import Case
 
 
 def execute():
-<<<<<<< HEAD
-	required_columns = [
-		"is_existing_asset",
-		"is_composite_asset",
-		"is_composite_component",
-	]
-
-	# Skip patch if any required column is missing
-	if not all(frappe.db.has_column("Asset", col) for col in required_columns):
-		return
-
-	Asset = frappe.qb.DocType("Asset")
-=======
 	# v15 sites never had is_composite_component; only migrate columns that exist.
 	column_values = (
 		("is_existing_asset", "Existing Asset"),
@@ -25,7 +12,6 @@ def execute():
 	existing = [(col, value) for col, value in column_values if frappe.db.has_column("Asset", col)]
 	if not existing:
 		return
->>>>>>> 6bdc18b (fix(asset): skip missing checkbox columns in asset type patch (#58416))
 
 	Asset = frappe.qb.DocType("Asset")
 	case = Case()