chore: resolve conflicts

2026-02-18 17:15:04 +00:00 · 2025-05-17 00:08:39 +05:30
parent 80c76618ae
commit 249d18962c
1 changed files with 0 additions and 5 deletions
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -263,12 +263,7 @@
   "write": 1
  }
 ],
-<<<<<<< HEAD
 "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> 2d9a6a4de8 (feat: add checbox for validating time logs in job card)
 "sort_order": "DESC",
 "states": [],
 "track_changes": 1