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/Consumable1/views/用户リスト.json | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
index f85f2a9..71a6cdc 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
@@ -1,23 +1,27 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "09574ae1-7a1d-465b-852b-6604abee87c2",
- "label" : "鐢ㄦ埛 銉偣銉�",
- "regions" : [ {
- "id" : "4b35d932-84a2-442d-9b0c-e5cb790b6580",
- "regionName" : "header",
- "type" : "region"
- }, {
- "id" : "b109e1ab-8757-414e-ba5d-cddeafb4eff1",
- "regionName" : "content",
- "type" : "region"
- }, {
- "id" : "6c741f21-5b6e-443a-a0af-4b7fb5151480",
- "regionName" : "footer",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "list-005"
-}
\ No newline at end of file
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "09574ae1-7a1d-465b-852b-6604abee87c2",
+ "label": "鐢ㄦ埛 銉偣銉�",
+ "regions": [
+ {
+ "id": "4b35d932-84a2-442d-9b0c-e5cb790b6580",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "id": "b109e1ab-8757-414e-ba5d-cddeafb4eff1",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "6c741f21-5b6e-443a-a0af-4b7fb5151480",
+ "regionName": "footer",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "list-005"
+}
--
Gitblit v1.9.1