nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +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

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

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