From cfa1a2b05085369536ed68074175efb9d142c40a Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sat, 22 Apr 2023 10:08:26 +0530 Subject: [PATCH] chore: conflicts --- .../service_level_agreement/service_level_agreement.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json index c48d114a821..551d9eb68e4 100644 --- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json +++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json @@ -198,11 +198,7 @@ } ], "links": [], -<<<<<<< HEAD - "modified": "2021-07-27 11:16:45.596579", -======= "modified": "2023-04-21 17:16:56.192560", ->>>>>>> ac871797b2 (fix: SLA permissions (#34981)) "modified_by": "Administrator", "module": "Support", "name": "Service Level Agreement",