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

fix: resolved conflict

Browse Source
This commit is contained in:
Nabin Hait
2024-05-14 19:29:23 +05:30
committed by GitHub
parent 0aca1e8e05
commit 8cca74d5ef
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/asset.json
View File

@@ -589,11 +589,7 @@
"link_fieldname": "target_asset" "link_fieldname": "target_asset"
} }
], ],
<<<<<<< HEAD
"modified": "2024-01-15 17:35:49.226603",
=======
"modified": "2024-04-18 16:45:47.306032", "modified": "2024-04-18 16:45:47.306032",
>>>>>>> 31841b4ab2 (refactor: renamed purchase receipt amount field to purchase amount)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset", "name": "Asset",
@@ -637,4 +633,4 @@
"states": [], "states": [],
"title_field": "asset_name", "title_field": "asset_name",
"track_changes": 1 "track_changes": 1
} }