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/topicDetail.json | 172 ++++++++++++++++++++++++++++----------------------------
1 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/views/topicDetail.json b/force-app/main/default/experiences/Partner21/views/topicDetail.json
index e80eea9..4b3ee67 100644
--- a/force-app/main/default/experiences/Partner21/views/topicDetail.json
+++ b/force-app/main/default/experiences/Partner21/views/topicDetail.json
@@ -1,93 +1,93 @@
{
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "componentName": "siteforce:sldsTwoCol84Layout",
- "dataProviders": [],
- "id": "38e59688-3353-4124-b571-862a162dff11",
- "label": "Topic Detail",
- "regions": [
- {
- "components": [
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "componentName": "siteforce:sldsTwoCol84Layout",
+ "dataProviders": [],
+ "id": "38e59688-3353-4124-b571-862a162dff11",
+ "label": "Topic Detail",
+ "regions": [
{
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "d6b687e5-f1a9-46f2-9bc3-78b95e261dfe",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c9480151-e5e7-4ded-a13c-f7c0204338ba",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "components": [
+ {
+ "componentAttributes": {
+ "recordId": "{!recordId}"
+ },
+ "componentName": "forceCommunity:recordHeadline",
+ "id": "d6b687e5-f1a9-46f2-9bc3-78b95e261dfe",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "c9480151-e5e7-4ded-a13c-f7c0204338ba",
+ "regionName": "header",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "canChangeSorting": false,
- "defaultFilter": "",
- "defaultSortOrderHomeFeed": "Relevance",
- "defaultSortOrderTopicsFeed": "Relevance",
- "feedDesign": "DEFAULT",
- "hasFeedSearch": false,
- "subjectId": "{!recordId}",
- "type": "Topics"
- },
- "componentName": "forceCommunity:forceCommunityFeed",
- "id": "5dd762d8-9d22-40de-b4bb-191391220741",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "90ff1fce-9ccb-41ad-8757-1470c2db974f",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
+ "components": [
+ {
+ "componentAttributes": {
+ "canChangeSorting": false,
+ "defaultFilter": "",
+ "defaultSortOrderHomeFeed": "Relevance",
+ "defaultSortOrderTopicsFeed": "Relevance",
+ "feedDesign": "DEFAULT",
+ "hasFeedSearch": false,
+ "subjectId": "{!recordId}",
+ "type": "Topics"
+ },
+ "componentName": "forceCommunity:forceCommunityFeed",
+ "id": "5dd762d8-9d22-40de-b4bb-191391220741",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "90ff1fce-9ccb-41ad-8757-1470c2db974f",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordDetail",
- "id": "b8b25258-493c-458b-8e9c-bee0c905fde2",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "782dcfa9-0d4f-47d9-8e37-789bd58f1f0a",
- "regionName": "sidebar",
- "type": "region"
- },
- {
- "id": "74af9e79-3377-4866-8c0a-9d7e6fe3ef45",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "components": [
+ {
+ "componentAttributes": {
+ "recordId": "{!recordId}"
+ },
+ "componentName": "forceCommunity:recordDetail",
+ "id": "b8b25258-493c-458b-8e9c-bee0c905fde2",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "782dcfa9-0d4f-47d9-8e37-789bd58f1f0a",
+ "regionName": "sidebar",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "{!Record.Description}",
- "title": "{!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "3486895a-d73b-4102-93a7-6d207fd0a00e",
- "renditionMap": {},
- "type": "component"
+ "id": "74af9e79-3377-4866-8c0a-9d7e6fe3ef45",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "{!Record.Description}",
+ "title": "{!Record._Title}"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "3486895a-d73b-4102-93a7-6d207fd0a00e",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "f26b2333-7b1a-48e6-a1a3-f3e34426f512",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "f26b2333-7b1a-48e6-a1a3-f3e34426f512",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "topic"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "topic"
}
--
Gitblit v1.9.1