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/Consumable_21/views/groupDetail.json | 114 ++++++++++++++++++++++++++++----------------------------
1 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/groupDetail.json b/force-app/main/default/experiences/Consumable_21/views/groupDetail.json
index 6e99b7e..bb14d3c 100644
--- a/force-app/main/default/experiences/Consumable_21/views/groupDetail.json
+++ b/force-app/main/default/experiences/Consumable_21/views/groupDetail.json
@@ -1,62 +1,62 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "e569b760-98dd-445a-821e-7694873d00da",
- "label": "Group Detail",
- "regions": [
- {
- "id": "3e422bed-e2ef-4fd3-8132-8bf00020d139",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "e569b760-98dd-445a-821e-7694873d00da",
+ "label": "Group Detail",
+ "regions": [
{
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "engagementManagersOnly": false,
- "engagementTabLabel": "Engagement",
- "feedTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related"
- },
- "componentName": "forceCommunity:groupRecordHomeTabs",
- "id": "19bda303-66db-43df-865e-26799c340d2a",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "f9ece1f5-e14d-4248-a917-e90d6d493c9e",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "0b0e39cb-3f0f-492a-a379-7b9ca09a4c8f",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "id": "3e422bed-e2ef-4fd3-8132-8bf00020d139",
+ "regionName": "header",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "06287af9-c6d9-4412-a3fe-49694e4be7e3",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "detailsTabLabel": "Details",
+ "engagementManagersOnly": false,
+ "engagementTabLabel": "Engagement",
+ "feedTabLabel": "Feed",
+ "recordId": "{!recordId}",
+ "relatedTabLabel": "Related"
+ },
+ "componentName": "forceCommunity:groupRecordHomeTabs",
+ "id": "19bda303-66db-43df-865e-26799c340d2a",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "f9ece1f5-e14d-4248-a917-e90d6d493c9e",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "0b0e39cb-3f0f-492a-a379-7b9ca09a4c8f",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "06287af9-c6d9-4412-a3fe-49694e4be7e3",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "391034d2-180c-4af1-80da-3df12c915f02",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "391034d2-180c-4af1-80da-3df12c915f02",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-0F9"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "detail-0F9"
}
--
Gitblit v1.9.1