CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-26 08:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-07-29 15:39:10 +05:30
committed by GitHub
parent 80ae9820f0
commit 4524c74968
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_repair/asset_repair.json
View File

@@ -265,11 +265,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-08-16 15:55:25.023471",
=======
"modified": "2025-07-29 15:14:34.044564",
>>>>>>> 5a82b723c2 (fix: post gl entry on completion date of asset repair)
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Repair",
@@ -314,4 +310,4 @@
"title_field": "asset_name",
"track_changes": 1,
"track_seen": 1
}
}