fix: conflicts

frappe · Apr 7, 2022 · 8932d70 · 8932d70
1 parent 07ff2cb
commit 8932d70
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -278,7 +278,6 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "timeline_field": "employee",
  "title_field": "employee_name",
  "track_changes": 1