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/feedDetail.json | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/views/feedDetail.json b/force-app/main/default/experiences/Partner21/views/feedDetail.json
index 4b2182d..7b2bdbd 100644
--- a/force-app/main/default/experiences/Partner21/views/feedDetail.json
+++ b/force-app/main/default/experiences/Partner21/views/feedDetail.json
@@ -1,39 +1,39 @@
{
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "c7ee8d3e-fb1b-4f58-8292-3ad0cc4824f9",
- "label": "Feed Detail",
- "regions": [
- {
- "id": "74c42e50-e42f-4346-9860-b8af7c69da3c",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "c7ee8d3e-fb1b-4f58-8292-3ad0cc4824f9",
+ "label": "Feed Detail",
+ "regions": [
{
- "componentAttributes": {
- "id": "{!recordId}"
- },
- "componentName": "forceCommunity:feedItemDetail",
- "id": "7227390c-acad-4d43-b9a3-ffa23063c2d5",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "74c42e50-e42f-4346-9860-b8af7c69da3c",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "id": "{!recordId}"
+ },
+ "componentName": "forceCommunity:feedItemDetail",
+ "id": "7227390c-acad-4d43-b9a3-ffa23063c2d5",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "87eb773e-465a-48c1-9414-21797f36e225",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "6b730d6e-03c4-4e6b-ad47-627110fa35a9",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "87eb773e-465a-48c1-9414-21797f36e225",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "6b730d6e-03c4-4e6b-ad47-627110fa35a9",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "feeditem-generic"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "feeditem-generic"
}
--
Gitblit v1.9.1