nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-02-26 11:30:57 +05:30
committed by GitHub
parent 5d2822df97
commit 6bebf51087
1 changed files with 0 additions and 4 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,
<<<<<<< HEAD
"modified": "2026-02-23 22:51:11.027665",
=======
"modified": "2026-02-26 10:45:47.970714", "modified": "2026-02-26 10:45:47.970714",
>>>>>>> 5c48f74d4c (fix: broekn link of docs in asset onboarding)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Onboarding", "name": "Asset Onboarding",