From ab61b46a01efd0acb074716cd53f542d4a04848f Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 30 Jun 2025 10:09:59 +0530 Subject: [PATCH] chore: fix conflicts --- .../asset_repair_consumed_item.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json index 76ff7f5e399..c502b65ab7f 100644 --- a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json +++ b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json @@ -83,12 +83,7 @@ "name": "Asset Repair Consumed Item", "owner": "Administrator", "permissions": [], -<<<<<<< HEAD "sort_field": "modified", -======= - "row_format": "Dynamic", - "sort_field": "creation", ->>>>>>> ae77c609ff (fix: option to pick serial / batch for asset repair) "sort_order": "DESC", "states": [], "track_changes": 1