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/homeFlexible.json | 190 +++++++++++++++++++++++-----------------------
1 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/homeFlexible.json b/force-app/main/default/experiences/Consumable_21/views/homeFlexible.json
index 07ef2bb..cf2c005 100644
--- a/force-app/main/default/experiences/Consumable_21/views/homeFlexible.json
+++ b/force-app/main/default/experiences/Consumable_21/views/homeFlexible.json
@@ -1,102 +1,102 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "39de1ffe-657d-431a-a91f-78a24fffef09",
- "label": "Home_Flexible",
- "regions": [
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "39de1ffe-657d-431a-a91f-78a24fffef09",
+ "label": "Home_Flexible",
+ "regions": [
{
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "42e03150-3b89-4a0e-ae58-10a1849e97f2",
- "columns": [
+ "components": [
{
- "UUID": "ec77531a-aa85-4cdf-a8f3-6e501f362481",
- "columnKey": "1",
- "columnName": "Column 1",
- "columnWidth": "12",
- "seedComponents": []
+ "componentAttributes": {
+ "background": "background: rgba(0,0,0,0)",
+ "backgroundOverlay": "rgba(0,0,0,0.5)",
+ "contentAreaWidth": 100,
+ "sectionConfig": {
+ "UUID": "42e03150-3b89-4a0e-ae58-10a1849e97f2",
+ "columns": [
+ {
+ "UUID": "ec77531a-aa85-4cdf-a8f3-6e501f362481",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "42e03150-3b89-4a0e-ae58-10a1849e97f2",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 48px; color: rgb(0, 71, 178);\">娆㈣繋鐧诲綍娑堣�楀搧杩芥函绯荤粺</span></p>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "c2bbc3ee-42d6-426e-bae3-186eae2ad1fe",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {},
+ "componentName": "c:lexLicenceReminder",
+ "id": "e123bb48-e1f9-4dc7-80ac-ac105a67f019",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "height": "800",
+ "recordId": "01Z6D000000EyGYUA0"
+ },
+ "componentName": "forceCommunity:dashboard",
+ "id": "59fb2dc5-2852-4033-b305-9f0674546441",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "ec77531a-aa85-4cdf-a8f3-6e501f362481",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
}
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "42e03150-3b89-4a0e-ae58-10a1849e97f2",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 48px; color: rgb(0, 71, 178);\">娆㈣繋鐧诲綍娑堣�楀搧杩芥函绯荤粺</span></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "c2bbc3ee-42d6-426e-bae3-186eae2ad1fe",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {},
- "componentName": "c:lexLicenceReminder",
- "id": "e123bb48-e1f9-4dc7-80ac-ac105a67f019",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "height": "800",
- "recordId": "01Z6D000000EyGYUA0"
- },
- "componentName": "forceCommunity:dashboard",
- "id": "59fb2dc5-2852-4033-b305-9f0674546441",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "ec77531a-aa85-4cdf-a8f3-6e501f362481",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "58b50363-ac2c-4227-8a26-3124c76ca3ea",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
+ ],
+ "id": "58b50363-ac2c-4227-8a26-3124c76ca3ea",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Home"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "947a50f9-e898-480b-ae6f-53f7945eea7d",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Home"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "947a50f9-e898-480b-ae6f-53f7945eea7d",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "19888308-454c-4b74-ad0a-1b02ef8ba938",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "19888308-454c-4b74-ad0a-1b02ef8ba938",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "home"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "home"
}
--
Gitblit v1.9.1