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/Site3/views/loginError.json | 103 ++++++++++++++++++++++++++++-----------------------
1 files changed, 56 insertions(+), 47 deletions(-)
diff --git a/force-app/main/default/experiences/Site3/views/loginError.json b/force-app/main/default/experiences/Site3/views/loginError.json
index cb274d5..3aa5dca 100644
--- a/force-app/main/default/experiences/Site3/views/loginError.json
+++ b/force-app/main/default/experiences/Site3/views/loginError.json
@@ -1,48 +1,57 @@
{
- "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "acfc3c4f-6e34-4219-a88a-39af60aece24",
- "label" : "Login Error",
- "regions" : [ {
- "id" : "f0dbcd6d-92d7-48ee-bdfe-878dee8e9a77",
- "regionName" : "header",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "richTextValue" : "<div style=\"text-align: center;\">Invalid Page</div>"
- },
- "componentName" : "forceCommunity:richTextInline",
- "id" : "178cb7f3-fed5-4bcb-8b17-8d42d49f03d9",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "ecdce3fb-0b9b-44ae-b7b0-fbf42f12e826",
- "regionName" : "content",
- "type" : "region"
- }, {
- "id" : "d7969d47-f741-49af-8879-5d2aa4a8b92b",
- "regionName" : "footer",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "Login Error"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "7124e5aa-b506-4383-acf2-cd508614a65c",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "e86aa86c-d5f8-481b-becd-f641d6dddb07",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Login",
- "type" : "view",
- "viewType" : "login-error"
-}
\ No newline at end of file
+ "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "acfc3c4f-6e34-4219-a88a-39af60aece24",
+ "label": "Login Error",
+ "regions": [
+ {
+ "id": "f0dbcd6d-92d7-48ee-bdfe-878dee8e9a77",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "178cb7f3-fed5-4bcb-8b17-8d42d49f03d9",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "ecdce3fb-0b9b-44ae-b7b0-fbf42f12e826",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "d7969d47-f741-49af-8879-5d2aa4a8b92b",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Login Error"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "7124e5aa-b506-4383-acf2-cd508614a65c",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "e86aa86c-d5f8-481b-becd-f641d6dddb07",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Login",
+ "type": "view",
+ "viewType": "login-error"
+}
--
Gitblit v1.9.1