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 | 138 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 69 deletions(-)
diff --git "a/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json" "b/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
index 3e98d0f..6efe452 100644
--- "a/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
+++ "b/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
@@ -1,76 +1,76 @@
{
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "85625454-b547-4267-8193-1220b85224c0",
- "label": "瀛︿細銉诲煿璁� 瑭崇窗",
- "regions": [
- {
- "id": "32f48fc5-7ab3-4ce7-8f65-b72ebb4c1833",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "85625454-b547-4267-8193-1220b85224c0",
+ "label": "瀛︿細銉诲煿璁� 瑭崇窗",
+ "regions": [
{
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "5981859e-261c-4517-b8f2-80fe1c284f8e",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "32f48fc5-7ab3-4ce7-8f65-b72ebb4c1833",
+ "regionName": "header",
+ "type": "region"
},
{
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related",
- "showLegacyActivityComposer": false,
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "chatter",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "1891936b-7484-488e-ae36-13746546ba83",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "66bc16a8-e319-4633-98fd-2d46385cda9f",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "5d86bb65-a182-4969-bc62-d42893f17dd9",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "components": [
+ {
+ "componentAttributes": {
+ "recordId": "{!recordId}"
+ },
+ "componentName": "forceCommunity:recordHeadline",
+ "id": "5981859e-261c-4517-b8f2-80fe1c284f8e",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "detailsTabLabel": "Details",
+ "discussionsTabLabel": "Feed",
+ "recordId": "{!recordId}",
+ "relatedTabLabel": "Related",
+ "showLegacyActivityComposer": false,
+ "tab1Type": "details",
+ "tab2Type": "related",
+ "tab3Type": "chatter",
+ "tab4Type": "none",
+ "timelineTabLabel": "Activity"
+ },
+ "componentName": "forceCommunity:recordHomeTabs",
+ "id": "1891936b-7484-488e-ae36-13746546ba83",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "66bc16a8-e319-4633-98fd-2d46385cda9f",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "441ecc2a-3a80-49cb-aade-b682e1c63a30",
- "renditionMap": {},
- "type": "component"
+ "id": "5d86bb65-a182-4969-bc62-d42893f17dd9",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "441ecc2a-3a80-49cb-aade-b682e1c63a30",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "0ae2ec43-789f-4a44-a7d6-55e0feaaa240",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "0ae2ec43-789f-4a44-a7d6-55e0feaaa240",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-701"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "detail-701"
}
--
Gitblit v1.9.1