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/streamDetail.json | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/streamDetail.json b/force-app/main/default/experiences/Consumable1/views/streamDetail.json
index bafe92c..5eed214 100644
--- a/force-app/main/default/experiences/Consumable1/views/streamDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/streamDetail.json
@@ -1,33 +1,39 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
- "label" : "Stream Detail",
- "regions" : [ {
- "id" : "48e57d3b-e3d0-4f72-be2f-a2fae7b65a0a",
- "regionName" : "header",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "id" : "{!recordId}"
- },
- "componentName" : "forceCommunity:streamDetail",
- "id" : "8c078f23-692d-4f99-a755-99025f03a1b5",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "cd36c50d-c89e-4a33-a381-6e21077775b9",
- "regionName" : "content",
- "type" : "region"
- }, {
- "id" : "a16a1ef4-47ac-4970-9d30-9cc7d15dd873",
- "regionName" : "footer",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "detail-0Fq"
-}
\ No newline at end of file
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
+ "label": "Stream Detail",
+ "regions": [
+ {
+ "id": "48e57d3b-e3d0-4f72-be2f-a2fae7b65a0a",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "id": "{!recordId}"
+ },
+ "componentName": "forceCommunity:streamDetail",
+ "id": "8c078f23-692d-4f99-a755-99025f03a1b5",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "cd36c50d-c89e-4a33-a381-6e21077775b9",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "a16a1ef4-47ac-4970-9d30-9cc7d15dd873",
+ "regionName": "footer",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "detail-0Fq"
+}
--
Gitblit v1.9.1