nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 13:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source 
Updated the modified date in learn_asset.json.
This commit is contained in:
rohitwaghchaure
2026-02-26 11:31:16 +05:30
committed by GitHub
parent 6bebf51087
commit 38c49dfed6
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/assets/onboarding_step/learn_asset/learn_asset.json
View File

@@ -8,11 +8,7 @@
"is_complete": 0, "is_complete": 0,
"is_single": 0, "is_single": 0,
"is_skipped": 0, "is_skipped": 0,
<<<<<<< HEAD
"modified": "2026-02-23 22:44:25.734547",
=======
"modified": "2026-02-26 10:44:59.557156", "modified": "2026-02-26 10:44:59.557156",
>>>>>>> 5c48f74d4c (fix: broekn link of docs in asset onboarding)
"modified_by": "Administrator", "modified_by": "Administrator",
"name": "Learn Asset", "name": "Learn Asset",
"owner": "Administrator", "owner": "Administrator",