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/checkPassword.json | 122 ++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/checkPassword.json b/force-app/main/default/experiences/Consumable_21/views/checkPassword.json
index 6b27d25..6322384 100644
--- a/force-app/main/default/experiences/Consumable_21/views/checkPassword.json
+++ b/force-app/main/default/experiences/Consumable_21/views/checkPassword.json
@@ -1,67 +1,67 @@
{
- "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "fde21273-a399-4352-84bd-df7f1081488c",
- "label": "Check Password",
- "regions": [
- {
- "components": [
+ "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "fde21273-a399-4352-84bd-df7f1081488c",
+ "label": "Check Password",
+ "regions": [
{
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">NOW, CHECK YOUR EMAIL</span></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "632b43b2-b321-494e-9a57-b1f7908b99a3",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">NOW, CHECK YOUR EMAIL</span></div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "632b43b2-b321-494e-9a57-b1f7908b99a3",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\">Check the email account associated with your user name for instructions on resetting your password. Remember to look in your spam folder, where automated messages sometimes filter. If you still can't log in, contact your administrator.</div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "a4d8f2ce-78dc-4ccc-8c23-4edeac459453",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Back to login</a></div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "a0a98e5e-54ab-4923-a170-2cc5458b576c",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "0c9fafcc-3ab2-4a5d-8502-ed3596149297",
+ "regionName": "content",
+ "type": "region"
},
{
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\">Check the email account associated with your user name for instructions on resetting your password. Remember to look in your spam folder, where automated messages sometimes filter. If you still can't log in, contact your administrator.</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "a4d8f2ce-78dc-4ccc-8c23-4edeac459453",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Back to login</a></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "a0a98e5e-54ab-4923-a170-2cc5458b576c",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Check Password"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "89e29191-a1ff-4603-bc80-efdbd4320217",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "2f359d06-d5b7-48bd-ba53-7561473e3b10",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "0c9fafcc-3ab2-4a5d-8502-ed3596149297",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Check Password"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "89e29191-a1ff-4603-bc80-efdbd4320217",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "2f359d06-d5b7-48bd-ba53-7561473e3b10",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "check-password"
+ ],
+ "themeLayoutType": "Login",
+ "type": "view",
+ "viewType": "check-password"
}
--
Gitblit v1.9.1