fix: conflicts

frappe · Apr 7, 2022 · 07ff2cb · 07ff2cb
1 parent 8393d11
commit 07ff2cb
Showing 1 changed file with 0 additions and 9 deletions.
diff --git 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)