nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-21 18:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-05-13 17:07:14 +05:30
committed by GitHub
parent 242a119f95
commit dcfae61a7a
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_category/asset_category.json
View File

@@ -73,11 +73,7 @@
} }
], ],
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-02-24 15:05:38.621803",
=======
"modified": "2025-05-13 15:33:03.791814", "modified": "2025-05-13 15:33:03.791814",
>>>>>>> fbbfd6531b (feat: add non depreciable category checkbox in asset category)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Category", "name": "Asset Category",