From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Partner21/views/caseDetail.json | 138 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/views/caseDetail.json b/force-app/main/default/experiences/Partner21/views/caseDetail.json
index b2cc1b9..63780fa 100644
--- a/force-app/main/default/experiences/Partner21/views/caseDetail.json
+++ b/force-app/main/default/experiences/Partner21/views/caseDetail.json
@@ -1,76 +1,76 @@
{
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "31166d77-4e5c-4bb8-9256-d2ab6ac88944",
- "label": "Case Detail",
- "regions": [
- {
- "id": "f4ea7f26-8780-4827-81e0-276ab1bf71ae",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "31166d77-4e5c-4bb8-9256-d2ab6ac88944",
+ "label": "Case Detail",
+ "regions": [
{
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "6e9dd3cc-f9ef-4bf6-9558-a48e1251b915",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "f4ea7f26-8780-4827-81e0-276ab1bf71ae",
+ "regionName": "header",
+ "type": "region"
},
{
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related",
- "showLegacyActivityComposer": false,
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "chatter",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "f28ca3a2-1a35-4fd5-9f39-a573ebb0bc22",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c0943f43-9565-410e-a804-ae56600c4715",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "083009eb-5078-400f-8e91-47eec449125f",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "components": [
+ {
+ "componentAttributes": {
+ "recordId": "{!recordId}"
+ },
+ "componentName": "forceCommunity:recordHeadline",
+ "id": "6e9dd3cc-f9ef-4bf6-9558-a48e1251b915",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "detailsTabLabel": "Details",
+ "discussionsTabLabel": "Feed",
+ "recordId": "{!recordId}",
+ "relatedTabLabel": "Related",
+ "showLegacyActivityComposer": false,
+ "tab1Type": "details",
+ "tab2Type": "related",
+ "tab3Type": "chatter",
+ "tab4Type": "none",
+ "timelineTabLabel": "Activity"
+ },
+ "componentName": "forceCommunity:recordHomeTabs",
+ "id": "f28ca3a2-1a35-4fd5-9f39-a573ebb0bc22",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "c0943f43-9565-410e-a804-ae56600c4715",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "62d4e06a-96b5-4fd3-bb06-06d430b102fb",
- "renditionMap": {},
- "type": "component"
+ "id": "083009eb-5078-400f-8e91-47eec449125f",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "62d4e06a-96b5-4fd3-bb06-06d430b102fb",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "a3e0bc10-2e00-4d45-bdc4-f28669bc4874",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "a3e0bc10-2e00-4d45-bdc4-f28669bc4874",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-500"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "detail-500"
}
--
Gitblit v1.9.1