nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix onboarding doctype merge conflicts (#53118)

Browse Source
This commit is contained in:
diptanilsaha
2026-03-03 15:46:34 +05:30
committed by GitHub
parent 0787c62cbc
commit 32c33631a6
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json
View File

@@ -15,11 +15,7 @@
"doctype": "Module Onboarding", "doctype": "Module Onboarding",
"idx": 0, "idx": 0,
"is_complete": 0, "is_complete": 0,
<<<<<<< version-16-hotfix
"modified": "2026-02-26 10:45:47.970714",
=======
"modified": "2026-02-26 10:50:47.970714", "modified": "2026-02-26 10:50:47.970714",
>>>>>>> version-16
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Onboarding", "name": "Asset Onboarding",

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,
<<<<<<< version-16-hotfix
"modified": "2026-02-26 10:44:59.557156",
=======
"modified": "2026-02-26 10:50:59.557156", "modified": "2026-02-26 10:50:59.557156",
>>>>>>> version-16
"modified_by": "Administrator", "modified_by": "Administrator",
"name": "Learn Asset", "name": "Learn Asset",
"owner": "Administrator", "owner": "Administrator",