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/reportList.json | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/reportList.json b/force-app/main/default/experiences/Consumable_21/views/reportList.json
index c565157..25b9801 100644
--- a/force-app/main/default/experiences/Consumable_21/views/reportList.json
+++ b/force-app/main/default/experiences/Consumable_21/views/reportList.json
@@ -1,37 +1,37 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "aec1e1b3-f846-4a3c-bb16-dc3a06c86c45",
- "label": "Report List",
- "regions": [
- {
- "id": "dab5410c-8cfd-4048-b659-d23d7723c9f3",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "aec1e1b3-f846-4a3c-bb16-dc3a06c86c45",
+ "label": "Report List",
+ "regions": [
{
- "componentAttributes": {},
- "componentName": "forceCommunity:reportList",
- "id": "be602af9-57bc-4622-863c-e55016dc1180",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "dab5410c-8cfd-4048-b659-d23d7723c9f3",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "forceCommunity:reportList",
+ "id": "be602af9-57bc-4622-863c-e55016dc1180",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "e6143314-c99f-4efb-9d10-b4b81c74bc57",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "c0089849-7e79-4b6f-ae67-578aaa75c9ed",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "e6143314-c99f-4efb-9d10-b4b81c74bc57",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "c0089849-7e79-4b6f-ae67-578aaa75c9ed",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-00O"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "list-00O"
}
--
Gitblit v1.9.1