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/loginError.json | 104 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/loginError.json b/force-app/main/default/experiences/Consumable_21/views/loginError.json
index e11a262..a8b0f1c 100644
--- a/force-app/main/default/experiences/Consumable_21/views/loginError.json
+++ b/force-app/main/default/experiences/Consumable_21/views/loginError.json
@@ -1,57 +1,57 @@
{
- "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "98860cc1-5078-4acf-adfa-a3eae3c02cea",
- "label": "Login Error",
- "regions": [
- {
- "id": "237d9340-be24-4f2d-961b-bd05627406c7",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "98860cc1-5078-4acf-adfa-a3eae3c02cea",
+ "label": "Login Error",
+ "regions": [
{
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "f3a2220a-a94e-4420-b2e0-49606c02ef85",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "c092f109-38aa-480c-812e-fd10e09eb23d",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "eb6a93ee-abdb-4ff4-aba6-b3f563e1c9a5",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "id": "237d9340-be24-4f2d-961b-bd05627406c7",
+ "regionName": "header",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Login Error"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "7133ba02-4672-47f9-85a2-5bc3cc264f3c",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "f3a2220a-a94e-4420-b2e0-49606c02ef85",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "c092f109-38aa-480c-812e-fd10e09eb23d",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "eb6a93ee-abdb-4ff4-aba6-b3f563e1c9a5",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Login Error"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "7133ba02-4672-47f9-85a2-5bc3cc264f3c",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "90940012-f896-472c-84cb-c29bf5a85604",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "90940012-f896-472c-84cb-c29bf5a85604",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "login-error"
+ ],
+ "themeLayoutType": "Login",
+ "type": "view",
+ "viewType": "login-error"
}
--
Gitblit v1.9.1