From 07ff2cb1d3e90ad96ac4d58b889acb49e6a524dd Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 7 Apr 2022 13:01:02 +0530 Subject: [PATCH] fix: conflicts --- .../hr/doctype/leave_allocation/leave_allocation.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json index 5e74b1894c9..3d5c1037f1f 100644 --- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json +++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json @@ -237,11 +237,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2021-10-01 15:28:26.335104", -======= "modified": "2022-04-07 09:50:33.145825", ->>>>>>> f8f1c3d8b5 (fix: enable Track Changes in Leave Allocation) "modified_by": "Administrator", "module": "HR", "name": "Leave Allocation", @@ -282,13 +278,8 @@ "show_name_in_global_search": 1, "sort_field": "modified", "sort_order": "DESC", -<<<<<<< HEAD - "timeline_field": "employee" -} -======= "states": [], "timeline_field": "employee", "title_field": "employee_name", "track_changes": 1 } ->>>>>>> f8f1c3d8b5 (fix: enable Track Changes in Leave Allocation)