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/lexProductLimitEdit.json | 148 ++++++++++++++++++++++++------------------------
1 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json b/force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json
index 99f9a97..9fd72cd 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json
@@ -1,81 +1,81 @@
{
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "57a80c74-e471-4b90-b214-580f7d3b66cd",
- "label": "LexProductLimitEdit",
- "regions": [
- {
- "components": [
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "57a80c74-e471-4b90-b214-580f7d3b66cd",
+ "label": "LexProductLimitEdit",
+ "regions": [
{
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
- "columns": [
+ "components": [
{
- "UUID": "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
- "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": "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
+ "columns": [
+ {
+ "UUID": "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "c:lexProductLimitEdit",
+ "id": "a096dd49-afe0-4796-8af0-cedd62664f2c",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
}
- ]
- },
- "sectionHeight": 300
- },
- "componentName": "forceCommunity:section",
- "id": "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {},
- "componentName": "c:lexProductLimitEdit",
- "id": "a096dd49-afe0-4796-8af0-cedd62664f2c",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
- "regionLabel": "Column 1",
- "regionName": "1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "d17f6f02-da3e-4235-81d9-1502e0ec6ca3",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
+ ],
+ "id": "d17f6f02-da3e-4235-81d9-1502e0ec6ca3",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "搴撳瓨涓婁笅闄� ~ 娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "f5b7eb44-8ce3-40c9-b71a-d5d9f3552955",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "搴撳瓨涓婁笅闄� ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "f5b7eb44-8ce3-40c9-b71a-d5d9f3552955",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "2257c0fb-ca9b-4e22-9e82-b20b1c22eb1d",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "2257c0fb-ca9b-4e22-9e82-b20b1c22eb1d",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexproductlimitedit"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "custom-lexproductlimitedit"
}
--
Gitblit v1.9.1