CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 09:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflict

Browse Source
This commit is contained in:
Khushi Rawat
2026-01-06 16:46:20 +05:30
committed by GitHub
parent dc10ef4287
commit dbd2964139
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/assets/doctype/asset_repair/asset_repair.json
View File

@@ -250,18 +250,8 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
<<<<<<< HEAD
"links": [], "links": [],
"modified": "2025-11-17 18:35:54.575265",
=======
"links": [
{
"link_doctype": "Stock Entry",
"link_fieldname": "asset_repair"
}
],
"modified": "2026-01-06 15:48:13.862505", "modified": "2026-01-06 15:48:13.862505",
>>>>>>> 49f1688a51 (feat: allow data import for asset repair doctype)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Repair", "name": "Asset Repair",
@@ -308,4 +298,4 @@
"title_field": "asset_name", "title_field": "asset_name",
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }