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/userList.json | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/userList.json b/force-app/main/default/experiences/Consumable_21/views/userList.json
index 4bb3a72..dd79979 100644
--- a/force-app/main/default/experiences/Consumable_21/views/userList.json
+++ b/force-app/main/default/experiences/Consumable_21/views/userList.json
@@ -1,27 +1,27 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "d02d6cf0-9943-4eae-87c2-4204b97a6232",
- "label": "User List",
- "regions": [
- {
- "id": "ef2c75bf-d9a0-4858-8847-809ab4bc10cc",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "80014acf-9da0-4466-9bbe-ae3042455267",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "52a10fdc-f3ae-4174-87ad-0367681b5e2d",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-005"
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "d02d6cf0-9943-4eae-87c2-4204b97a6232",
+ "label": "User List",
+ "regions": [
+ {
+ "id": "ef2c75bf-d9a0-4858-8847-809ab4bc10cc",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "id": "80014acf-9da0-4466-9bbe-ae3042455267",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "52a10fdc-f3ae-4174-87ad-0367681b5e2d",
+ "regionName": "footer",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "list-005"
}
--
Gitblit v1.9.1