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/lexArriveGoods.json | 148 ++++++++++++++++++++++++------------------------
1 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/lexArriveGoods.json b/force-app/main/default/experiences/Consumable_21/views/lexArriveGoods.json
index 67ce9c4..c8651ad 100644
--- a/force-app/main/default/experiences/Consumable_21/views/lexArriveGoods.json
+++ b/force-app/main/default/experiences/Consumable_21/views/lexArriveGoods.json
@@ -1,81 +1,81 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "34b57eb7-60b0-4af7-93d2-e97bd3871568",
- "label": "LexArriveGoods",
- "regions": [
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "34b57eb7-60b0-4af7-93d2-e97bd3871568",
+ "label": "LexArriveGoods",
+ "regions": [
{
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "fab072b8-cfe9-4fc4-92ef-169966c92f2e",
- "columns": [
+ "components": [
{
- "UUID": "cabdb2a6-fa8b-46b9-9444-310e02c792ec",
- "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": "fab072b8-cfe9-4fc4-92ef-169966c92f2e",
+ "columns": [
+ {
+ "UUID": "cabdb2a6-fa8b-46b9-9444-310e02c792ec",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "fab072b8-cfe9-4fc4-92ef-169966c92f2e",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "c:lexArriveGoods",
+ "id": "f265ac1a-a311-4c81-8657-3e89f9fe0a40",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "cabdb2a6-fa8b-46b9-9444-310e02c792ec",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
}
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "fab072b8-cfe9-4fc4-92ef-169966c92f2e",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexArriveGoods",
- "id": "f265ac1a-a311-4c81-8657-3e89f9fe0a40",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "cabdb2a6-fa8b-46b9-9444-310e02c792ec",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "a7efd8ce-da78-4e00-a6c7-b98cad1cfc0e",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
+ ],
+ "id": "a7efd8ce-da78-4e00-a6c7-b98cad1cfc0e",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "LexArriveGoods"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "541faf05-86f2-431f-9595-0321d1850db3",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "LexArriveGoods"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "541faf05-86f2-431f-9595-0321d1850db3",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "699a6330-1a2e-4834-9513-563517ff24e9",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "699a6330-1a2e-4834-9513-563517ff24e9",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexarrivegoods"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "custom-lexarrivegoods"
}
--
Gitblit v1.9.1