chore: resolved conflicts

2025-06-30 01:03:49 +05:30
parent 6f24c02121
commit f31b008502
1 changed files with 0 additions and 9 deletions
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -249,11 +249,7 @@
 "index_web_pages_for_search": 1,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2024-06-13 16:14:14.398356",
-=======
 "modified": "2025-06-29 22:30:00.589597",
->>>>>>> c6baa34812 (fix: validate asset before repair)
 "modified_by": "Administrator",
 "module": "Assets",
 "name": "Asset Repair",
@@ -291,12 +287,7 @@
   "write": 1
  }
 ],
-<<<<<<< HEAD
 "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> c6baa34812 (fix: validate asset before repair)
 "sort_order": "DESC",
 "states": [],
 "title_field": "asset_name",