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/Consumable1/views/lexCancelRemoveBox.json | 148 ++++++++++++++++++++++++------------------------
1 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json b/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json
index 5e6c009..39f207d 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json
@@ -1,81 +1,81 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "5fd84b73-2065-46d3-b121-2f8a77b76a3a",
- "label": "LexCancelRemoveBox",
- "regions": [
- {
- "components": [
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "5fd84b73-2065-46d3-b121-2f8a77b76a3a",
+ "label": "LexCancelRemoveBox",
+ "regions": [
{
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "e015f78b-3948-452d-9df3-fb57eaf1144a",
- "columns": [
+ "components": [
{
- "UUID": "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
- "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": "e015f78b-3948-452d-9df3-fb57eaf1144a",
+ "columns": [
+ {
+ "UUID": "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "e015f78b-3948-452d-9df3-fb57eaf1144a",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "c:lexCancelRemoveBox",
+ "id": "de961c6a-bc79-4956-aaf1-9b9a9329cd7b",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
}
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "e015f78b-3948-452d-9df3-fb57eaf1144a",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexCancelRemoveBox",
- "id": "de961c6a-bc79-4956-aaf1-9b9a9329cd7b",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "63a06f7d-bca6-430e-b51f-04c307c741f9",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
+ ],
+ "id": "63a06f7d-bca6-430e-b51f-04c307c741f9",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "鍙栨秷鎷嗙洅 ~ 娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "495b4819-9802-4a8b-af22-b33a65ed6dde",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "鍙栨秷鎷嗙洅 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "495b4819-9802-4a8b-af22-b33a65ed6dde",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "fc3783d1-cb91-473f-87a0-62c480010a60",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "fc3783d1-cb91-473f-87a0-62c480010a60",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexcancelremovebox"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "custom-lexcancelremovebox"
}
--
Gitblit v1.9.1