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/lexConsumable.json | 148 ++++++++++++++++++++++++------------------------
1 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/lexConsumable.json b/force-app/main/default/experiences/Consumable_21/views/lexConsumable.json
index b65a6d2..e46a6fa 100644
--- a/force-app/main/default/experiences/Consumable_21/views/lexConsumable.json
+++ b/force-app/main/default/experiences/Consumable_21/views/lexConsumable.json
@@ -1,81 +1,81 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "ba77614e-6f6b-4e0f-95b1-7f08a6b87196",
- "label": "LexConsumable",
- "regions": [
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "ba77614e-6f6b-4e0f-95b1-7f08a6b87196",
+ "label": "LexConsumable",
+ "regions": [
{
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "f20097d1-9c45-4f02-be74-79abd158eaea",
- "columns": [
+ "components": [
{
- "UUID": "9023b66f-a63a-4d1c-a624-7c0d829521d6",
- "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": "f20097d1-9c45-4f02-be74-79abd158eaea",
+ "columns": [
+ {
+ "UUID": "9023b66f-a63a-4d1c-a624-7c0d829521d6",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "f20097d1-9c45-4f02-be74-79abd158eaea",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "c:lexConsumable",
+ "id": "83a022af-30b7-4422-9fb7-349acf61bf64",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "9023b66f-a63a-4d1c-a624-7c0d829521d6",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
}
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "f20097d1-9c45-4f02-be74-79abd158eaea",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexConsumable",
- "id": "83a022af-30b7-4422-9fb7-349acf61bf64",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "9023b66f-a63a-4d1c-a624-7c0d829521d6",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "f69f6c55-69ba-4d81-ba80-74e22b66a0c0",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
+ ],
+ "id": "f69f6c55-69ba-4d81-ba80-74e22b66a0c0",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "LexConsumable"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "450ae28a-55c6-4faa-9766-e1fbe8a7f446",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "LexConsumable"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "450ae28a-55c6-4faa-9766-e1fbe8a7f446",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "f4976d52-3cf0-42be-ac65-e6d343395f80",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "f4976d52-3cf0-42be-ac65-e6d343395f80",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexconsumable"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "custom-lexconsumable"
}
--
Gitblit v1.9.1