From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Partner21/views/用户リスト.json | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git "a/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
index 77dfdce..8228694 100644
--- "a/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
@@ -1,27 +1,27 @@
{
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "33b1c4cb-6778-4461-9977-a79f65eb2665",
- "label": "鐢ㄦ埛 銉偣銉�",
- "regions": [
- {
- "id": "a32b648e-21b7-40e6-a4d0-aa08b457edfe",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "e91778d9-2f16-4fea-a2f7-4209768f614a",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "b74fafd1-f46b-457a-b321-451ba3898ef9",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-005"
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "33b1c4cb-6778-4461-9977-a79f65eb2665",
+ "label": "鐢ㄦ埛 銉偣銉�",
+ "regions": [
+ {
+ "id": "a32b648e-21b7-40e6-a4d0-aa08b457edfe",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "id": "e91778d9-2f16-4fea-a2f7-4209768f614a",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "b74fafd1-f46b-457a-b321-451ba3898ef9",
+ "regionName": "footer",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "list-005"
}
--
Gitblit v1.9.1