[fix] merge conflicts

2026-05-27 00:44:45 +00:00 · 2017-12-01 16:23:46 +05:30
parent e90a1caeb1 b36dc5e906
commit d505d83cb6
5 changed files with 16 additions and 6 deletions
--- a/erpnext/assets/doctype/asset_category/asset_category.json
+++ b/erpnext/assets/doctype/asset_category/asset_category.json
@@ -62,7 +62,7 @@
   "label": "Depreciation Method", 
   "length": 0, 
   "no_copy": 0, 
-   "options": "\nStraight Line\nDouble Declining Balance", 
+   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -312,4 +312,4 @@
 "sort_order": "DESC", 
 "track_changes": 0, 
 "track_seen": 0
-}
+}