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

fix: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-01-08 11:07:30 +05:30
committed by GitHub
parent 1ea36bba88
commit 7318748a4c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -595,11 +595,7 @@
"link_fieldname": "target_asset" "link_fieldname": "target_asset"
} }
], ],
<<<<<<< HEAD
"modified": "2024-08-26 23:28:29.095139",
=======
"modified": "2024-12-26 14:23:20.968882", "modified": "2024-12-26 14:23:20.968882",
>>>>>>> 6850019649 (feat: work in progress status for asset (#45066))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset", "name": "Asset",