chore: fix conflicts

Author: ruchamahabal

hrms/hr/doctype/attendance/attendance.json

@@ -207,11 +207,7 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-15 20:09:21.730465",
-=======
  "modified": "2024-04-05 20:55:02.905452",
->>>>>>> c82d9a40e (chore: add read perm for Employee on Attendance)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Attendance",