fix: conflicts

This commit is contained in:
Rucha Mahabal
2022-04-07 13:01:39 +05:30
parent 07ff2cb1d3
commit 8932d7040f

View File

@@ -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