chore: fix conflicts

frappe · Aug 29, 2024 · d698461 · d698461
1 parent 510ec80
commit d698461
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/hrms/hr/doctype/shift_type/shift_type.json b/hrms/hr/doctype/shift_type/shift_type.json
@@ -176,11 +176,7 @@
   }
  ],
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-08-22 11:31:24.381593",
-=======
  "modified": "2024-05-17 15:48:27.191003",
->>>>>>> cf3b37100 (feat: add colors for shift types)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Type",