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/dashboardList.json | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/dashboardList.json b/force-app/main/default/experiences/Consumable_21/views/dashboardList.json
index 77cabbc..03a3bbd 100644
--- a/force-app/main/default/experiences/Consumable_21/views/dashboardList.json
+++ b/force-app/main/default/experiences/Consumable_21/views/dashboardList.json
@@ -1,37 +1,37 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "5ac09d10-30b2-49e0-a01b-26452f691876",
- "label": "Dashboard List",
- "regions": [
- {
- "id": "daa6e8e3-77f0-4065-9901-711c8efaa5a7",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "5ac09d10-30b2-49e0-a01b-26452f691876",
+ "label": "Dashboard List",
+ "regions": [
{
- "componentAttributes": {},
- "componentName": "forceCommunity:dashboardList",
- "id": "c7146be9-1bfc-412e-96b0-91ac3ea31fe3",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "daa6e8e3-77f0-4065-9901-711c8efaa5a7",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "forceCommunity:dashboardList",
+ "id": "c7146be9-1bfc-412e-96b0-91ac3ea31fe3",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "cd7bf953-8f03-4944-bd82-3de39e50e3bc",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "2ac5c3dc-eb46-4a8d-b777-c1890d995fde",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "cd7bf953-8f03-4944-bd82-3de39e50e3bc",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "2ac5c3dc-eb46-4a8d-b777-c1890d995fde",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-01Z"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "list-01Z"
}
--
Gitblit v1.9.1