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 | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git "a/force-app/main/default/experiences/Partner21/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 9d8c773..d1d82a0 100644
--- "a/force-app/main/default/experiences/Partner21/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Partner21/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,45 +1,45 @@
{
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "2bfba25e-daf0-49ff-924f-f69f9d9fb327",
- "label": "灏忕粍 闁㈤�ｃ儶銈广儓",
- "regions": [
- {
- "id": "663b38e0-6257-4c51-81c5-ea60cbcb6b31",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "2bfba25e-daf0-49ff-924f-f69f9d9fb327",
+ "label": "灏忕粍 闁㈤�ｃ儶銈广儓",
+ "regions": [
{
- "componentAttributes": {
- "customTitle": "",
- "parentRecordId": "{!recordId}",
- "relatedListName": "{!relationshipApiName}",
- "showBreadCrumbs": true,
- "showCustomTitle": false,
- "showManualRefreshButton": true,
- "showRowNumbers": true
- },
- "componentName": "forceCommunity:relatedList",
- "id": "407fbce1-4ac5-45c4-9fa3-24bd9017c409",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "663b38e0-6257-4c51-81c5-ea60cbcb6b31",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customTitle": "",
+ "parentRecordId": "{!recordId}",
+ "relatedListName": "{!relationshipApiName}",
+ "showBreadCrumbs": true,
+ "showCustomTitle": false,
+ "showManualRefreshButton": true,
+ "showRowNumbers": true
+ },
+ "componentName": "forceCommunity:relatedList",
+ "id": "407fbce1-4ac5-45c4-9fa3-24bd9017c409",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "35e19b13-28c4-4e12-8d53-ef16eef240ce",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "a607e833-1ba0-4d54-8a36-b513616ec2ee",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "35e19b13-28c4-4e12-8d53-ef16eef240ce",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "a607e833-1ba0-4d54-8a36-b513616ec2ee",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "relatedlist-0F9"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "relatedlist-0F9"
}
--
Gitblit v1.9.1