From 4b9120e629439ca9adb5a51ebc5fa543a185d97b Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 12 Dec 2023 15:27:56 +0530 Subject: [PATCH] chore: fix conflicts --- hrms/payroll/doctype/salary_detail/salary_detail.json | 4 ---- hrms/payroll/doctype/salary_structure/salary_structure.json | 4 ---- 2 files changed, 8 deletions(-) diff --git a/hrms/payroll/doctype/salary_detail/salary_detail.json b/hrms/payroll/doctype/salary_detail/salary_detail.json index 681f4c7b7b..b8cd6f6dc7 100644 --- 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 index 79057a5469..5d9df18fd7 100644 --- 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",