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/flow.json | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/flow.json b/force-app/main/default/experiences/Consumable_21/views/flow.json
index ae7e3d0..b2243b0 100644
--- a/force-app/main/default/experiences/Consumable_21/views/flow.json
+++ b/force-app/main/default/experiences/Consumable_21/views/flow.json
@@ -1,40 +1,40 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "585885fb-a1ef-4d95-8292-c21afacfe18e",
- "label": "Flow",
- "regions": [
- {
- "id": "f4616871-b78c-4a6c-af1c-9db69882e2cc",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "585885fb-a1ef-4d95-8292-c21afacfe18e",
+ "label": "Flow",
+ "regions": [
{
- "componentAttributes": {
- "flowArguments": "",
- "flowName": "{!flowName}"
- },
- "componentName": "forceCommunity:flowCommunity",
- "id": "8372bd3c-e7b7-4fe0-bf67-427a51da6ccd",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "f4616871-b78c-4a6c-af1c-9db69882e2cc",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "flowArguments": "",
+ "flowName": "{!flowName}"
+ },
+ "componentName": "forceCommunity:flowCommunity",
+ "id": "8372bd3c-e7b7-4fe0-bf67-427a51da6ccd",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "d8ae14d8-6c6a-4cf9-92de-51c84f9df98d",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "c256a7da-41ba-4951-bc47-2465b2845133",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "d8ae14d8-6c6a-4cf9-92de-51c84f9df98d",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "c256a7da-41ba-4951-bc47-2465b2845133",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "flow"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "flow"
}
--
Gitblit v1.9.1