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/streamDetail.json | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/streamDetail.json b/force-app/main/default/experiences/Consumable_21/views/streamDetail.json
index ce79d5e..fca4d4a 100644
--- a/force-app/main/default/experiences/Consumable_21/views/streamDetail.json
+++ b/force-app/main/default/experiences/Consumable_21/views/streamDetail.json
@@ -1,39 +1,39 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "2ed3971e-2e0b-49e1-957a-db8edf28e905",
- "label": "Stream Detail",
- "regions": [
- {
- "id": "582d5e1d-8c96-49ff-b99a-00ab45faa387",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "2ed3971e-2e0b-49e1-957a-db8edf28e905",
+ "label": "Stream Detail",
+ "regions": [
{
- "componentAttributes": {
- "id": "{!recordId}"
- },
- "componentName": "forceCommunity:streamDetail",
- "id": "b1c70c13-2121-4b60-b495-fca4784c9745",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "582d5e1d-8c96-49ff-b99a-00ab45faa387",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "id": "{!recordId}"
+ },
+ "componentName": "forceCommunity:streamDetail",
+ "id": "b1c70c13-2121-4b60-b495-fca4784c9745",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "f548dc0e-20e8-4f9d-b3de-575f397d1117",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "a5e84e98-5bc5-4d9c-95d0-70aa6cdd6004",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "f548dc0e-20e8-4f9d-b3de-575f397d1117",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "a5e84e98-5bc5-4d9c-95d0-70aa6cdd6004",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-0Fq"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "detail-0Fq"
}
--
Gitblit v1.9.1