CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 16:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2024-10-22 01:17:33 +05:30
committed by GitHub
parent a3b8f9759d
commit 0a03076148
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
View File

@@ -180,11 +180,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2021-01-22 12:33:45.888124",
=======
"modified": "2024-09-24 15:12:37.497853",
>>>>>>> 5911934dc7 (feat: added assignee email field in asset maintenance log)
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Maintenance Log",
@@ -211,4 +207,4 @@
"sort_order": "DESC",
"track_changes": 1,
"track_seen": 1
}
}