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/Consumable1/views/topicCatalog.json | 134 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/topicCatalog.json b/force-app/main/default/experiences/Consumable1/views/topicCatalog.json
index 560723e..6a820dd 100644
--- a/force-app/main/default/experiences/Consumable1/views/topicCatalog.json
+++ b/force-app/main/default/experiences/Consumable1/views/topicCatalog.json
@@ -1,73 +1,73 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "bc041b32-bf8f-47ac-8c7d-35d8b4167ee7",
- "label": "Topic Catalog",
- "regions": [
- {
- "components": [
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "3912430c-3c10-4bf3-bf37-5a619a596491",
+ "label": "Topic Catalog",
+ "regions": [
{
- "componentAttributes": {
- "bannerText": "",
- "bannerTextWithKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
- "bannerTextWithoutKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
- "pageType": "",
- "showSubTopics": true,
- "title": "Topics",
- "uniqueNameOrId": ""
- },
- "componentName": "forceCommunity:headline",
- "id": "2dea3547-05b7-4553-b77d-4792aac6c392",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "4aa7eaf6-e706-4e57-9ce3-9c8f3cf26246",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "components": [
+ {
+ "componentAttributes": {
+ "bannerText": "",
+ "bannerTextWithKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
+ "bannerTextWithoutKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
+ "pageType": "",
+ "showSubTopics": true,
+ "title": "Topics",
+ "uniqueNameOrId": ""
+ },
+ "componentName": "forceCommunity:headline",
+ "id": "bb3cf42e-7839-4d1b-9397-61f43400e885",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "e0161633-e87a-4873-a308-f87278393077",
+ "regionName": "header",
+ "type": "region"
+ },
{
- "componentAttributes": {},
- "componentName": "forceCommunity:topicCatalog",
- "id": "ca681efe-4067-4a6c-b442-e95f316babae",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6b2ab383-10e2-4ce7-aed3-1d8ab837fa13",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "266bf649-4b83-43f8-a08c-d227b505ca84",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "forceCommunity:topicCatalog",
+ "id": "c4149a20-518c-4518-8f16-363ca10cb9fd",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "0250f471-2b7a-48e8-894e-775d5d3edb11",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Topic Catalog"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "a8fbeba0-f3a7-46c8-93d9-7aaa0035f1ab",
- "renditionMap": {},
- "type": "component"
+ "id": "36965db0-cc03-4916-b508-0b3747f12f39",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Topic Catalog"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "e81daa52-bbe0-4f2d-bd9e-a43f4156623b",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "44a8bb9f-9013-450a-ab7d-d6da72269e33",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "dd88451a-81bf-48c6-bea8-1f411e587fb7",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "topic-catalog"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "topic-catalog"
}
--
Gitblit v1.9.1