From 32c33631a64dde18e707e41ba4c13c21bd9cf721 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Tue, 3 Mar 2026 15:46:34 +0530 Subject: [PATCH] chore: fix onboarding doctype merge conflicts (#53118) --- .../module_onboarding/asset_onboarding/asset_onboarding.json | 4 ---- erpnext/assets/onboarding_step/learn_asset/learn_asset.json | 4 ---- 2 files changed, 8 deletions(-) diff --git a/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json b/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json index 7a4b953696a..d8a8c4ba00b 100644 --- a/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json +++ b/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json @@ -15,11 +15,7 @@ "doctype": "Module Onboarding", "idx": 0, "is_complete": 0, -<<<<<<< version-16-hotfix - "modified": "2026-02-26 10:45:47.970714", -======= "modified": "2026-02-26 10:50:47.970714", ->>>>>>> version-16 "modified_by": "Administrator", "module": "Assets", "name": "Asset Onboarding", diff --git a/erpnext/assets/onboarding_step/learn_asset/learn_asset.json b/erpnext/assets/onboarding_step/learn_asset/learn_asset.json index 890e092b21a..265d6759150 100644 --- a/erpnext/assets/onboarding_step/learn_asset/learn_asset.json +++ b/erpnext/assets/onboarding_step/learn_asset/learn_asset.json @@ -8,11 +8,7 @@ "is_complete": 0, "is_single": 0, "is_skipped": 0, -<<<<<<< version-16-hotfix - "modified": "2026-02-26 10:44:59.557156", -======= "modified": "2026-02-26 10:50:59.557156", ->>>>>>> version-16 "modified_by": "Administrator", "name": "Learn Asset", "owner": "Administrator",