chore: fix conflicts

frappe · Dec 12, 2023 · 4b9120e · 4b9120e
1 parent 7e8092b
commit 4b9120e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/hrms/payroll/doctype/salary_detail/salary_detail.json b/hrms/payroll/doctype/salary_detail/salary_detail.json
@@ -251,11 +251,7 @@
  ],
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-01-17 13:04:44.167515",
-=======
  "modified": "2023-12-12 13:52:30.726505",
->>>>>>> 35fd55ea8 (fix: remove statistical component from list view display)
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Salary Detail",

diff --git a/hrms/payroll/doctype/salary_structure/salary_structure.json b/hrms/payroll/doctype/salary_structure/salary_structure.json
@@ -236,11 +236,7 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-13 18:02:31.779947",
-=======
  "modified": "2023-12-12 14:11:22.774017",
->>>>>>> 35fd55ea8 (fix: remove statistical component from list view display)
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Salary Structure",