mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-25 01:28:29 +00:00
chore: fix conflicts
Updated the modified date in learn_asset.json.
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user