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/dashboardDetail.json | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/dashboardDetail.json b/force-app/main/default/experiences/Consumable_21/views/dashboardDetail.json
index 7cc21d2..9e9c8a2 100644
--- a/force-app/main/default/experiences/Consumable_21/views/dashboardDetail.json
+++ b/force-app/main/default/experiences/Consumable_21/views/dashboardDetail.json
@@ -1,58 +1,58 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "62c1cd02-8480-40fa-904f-418af2153eca",
- "label": "Dashboard Detail",
- "regions": [
- {
- "id": "22074c71-247e-4d46-9592-b1a9bcdfe024",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "62c1cd02-8480-40fa-904f-418af2153eca",
+ "label": "Dashboard Detail",
+ "regions": [
{
- "componentAttributes": {
- "height": "1065",
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:dashboard",
- "id": "e6c192bc-4e57-484e-a5ac-141d4a624b2a",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "3327088d-8b39-452b-bf17-63cc1b96a0a3",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "08cb94c4-e4c4-4324-bf97-57dea84fc9fc",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "id": "22074c71-247e-4d46-9592-b1a9bcdfe024",
+ "regionName": "header",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "e9d8fbd5-8938-4934-969d-6764066bd2b8",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "height": "1065",
+ "recordId": "{!recordId}"
+ },
+ "componentName": "forceCommunity:dashboard",
+ "id": "e6c192bc-4e57-484e-a5ac-141d4a624b2a",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "3327088d-8b39-452b-bf17-63cc1b96a0a3",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "08cb94c4-e4c4-4324-bf97-57dea84fc9fc",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "e9d8fbd5-8938-4934-969d-6764066bd2b8",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "8e50cedc-f527-4b9c-9a9a-cf585c7e3091",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "8e50cedc-f527-4b9c-9a9a-cf585c7e3091",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-01Z"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "detail-01Z"
}
--
Gitblit v1.9.1