From 38c49dfed6e50d882d5266f33da9da439bf8d35c Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 26 Feb 2026 11:31:16 +0530 Subject: [PATCH] chore: fix conflicts Updated the modified date in learn_asset.json. --- erpnext/assets/onboarding_step/learn_asset/learn_asset.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/assets/onboarding_step/learn_asset/learn_asset.json b/erpnext/assets/onboarding_step/learn_asset/learn_asset.json index 8e02f16cff4..8feef0073f5 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, -<<<<<<< HEAD - "modified": "2026-02-23 22:44:25.734547", -======= "modified": "2026-02-26 10:44:59.557156", ->>>>>>> 5c48f74d4c (fix: broekn link of docs in asset onboarding) "modified_by": "Administrator", "name": "Learn Asset", "owner": "Administrator",