From 6bebf5108780a05aad21503fec9149d08169b051 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 26 Feb 2026 11:30:57 +0530 Subject: [PATCH] chore: fix conflicts --- .../module_onboarding/asset_onboarding/asset_onboarding.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json b/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json index 6985d41775d..ba38d0af6f6 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, -<<<<<<< HEAD - "modified": "2026-02-23 22:51:11.027665", -======= "modified": "2026-02-26 10:45:47.970714", ->>>>>>> 5c48f74d4c (fix: broekn link of docs in asset onboarding) "modified_by": "Administrator", "module": "Assets", "name": "Asset Onboarding",