From 8932d7040fa6e45207364ee4863ee47241907dda Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 7 Apr 2022 13:01:39 +0530 Subject: [PATCH] fix: conflicts --- erpnext/hr/doctype/leave_allocation/leave_allocation.json | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json index 3d5c1037f1f7..4a9b54034af9 100644 --- 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