chore: fix conflicts

frappe · Jan 13, 2025 · 888c2e8 · 888c2e8
1 parent ba15daa
commit 888c2e8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.json b/hrms/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -186,11 +186,7 @@
  "idx": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-03-20 15:05:39.635388",
-=======
  "modified": "2025-01-13 13:47:55.262534",
->>>>>>> 8a415caf (fix: disable 'User Cannot Search' for bulk tools (#2630))
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Control Panel",
@@ -203,12 +199,7 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
- "read_only": 1,
- "sort_field": "modified",
-=======
  "sort_field": "creation",
->>>>>>> 8a415caf (fix: disable 'User Cannot Search' for bulk tools (#2630))
  "sort_order": "DESC",
  "states": []
 }
diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.json b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.json
@@ -163,12 +163,7 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
- "read_only": 1,
- "sort_field": "modified",
-=======
  "sort_field": "creation",
->>>>>>> 8a415caf (fix: disable 'User Cannot Search' for bulk tools (#2630))
  "sort_order": "DESC",
  "states": []
 }