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/Partner21/views/forgotPassword.json | 146 ++++++++++++++++++++++++------------------------
1 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/views/forgotPassword.json b/force-app/main/default/experiences/Partner21/views/forgotPassword.json
index 092bf5a..96106f5 100644
--- a/force-app/main/default/experiences/Partner21/views/forgotPassword.json
+++ b/force-app/main/default/experiences/Partner21/views/forgotPassword.json
@@ -1,79 +1,79 @@
{
- "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "c97e5e6e-dc54-450d-9151-4a62fb2e007c",
- "label": "Forgot Password",
- "regions": [
- {
- "components": [
+ "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "c97e5e6e-dc54-450d-9151-4a62fb2e007c",
+ "label": "Forgot Password",
+ "regions": [
{
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">PASSWORD RESET</span></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "c7e9f665-2bc7-4885-9e57-ee41297aaa08",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">PASSWORD RESET</span></div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "c7e9f665-2bc7-4885-9e57-ee41297aaa08",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\">To reset your password, we'll need your username.<br/> We'll send password reset instructions to the email address associated with your account.</div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "740594ef-8f7d-4526-889b-95c5eae3878f",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "checkEmailUrl": "./CheckPasswordResetEmail",
+ "submitButtonLabel": "Reset Password",
+ "usernameLabel": "Username"
+ },
+ "componentName": "salesforceIdentity:forgotPassword2",
+ "id": "660945ed-e9e9-4837-a7c5-b0eb43cce015",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\"><a href=\"./\">Cancel</a></div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "0da32bb8-8779-47df-8a31-073e72e4d2c2",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "64149aeb-d880-4aee-9d7c-60fe9bf31da7",
+ "regionName": "content",
+ "type": "region"
},
{
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\">To reset your password, we'll need your username.<br/> We'll send password reset instructions to the email address associated with your account.</div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "740594ef-8f7d-4526-889b-95c5eae3878f",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "checkEmailUrl": "./CheckPasswordResetEmail",
- "submitButtonLabel": "Reset Password",
- "usernameLabel": "Username"
- },
- "componentName": "salesforceIdentity:forgotPassword2",
- "id": "660945ed-e9e9-4837-a7c5-b0eb43cce015",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<div style=\"text-align: center;\"><a href=\"./\">Cancel</a></div>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "0da32bb8-8779-47df-8a31-073e72e4d2c2",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Forgot Password"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "2218d58a-55f3-442f-a853-d3ce487d6778",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "a70b8473-0be4-491a-9641-682f8385b06d",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "64149aeb-d880-4aee-9d7c-60fe9bf31da7",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Forgot Password"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "2218d58a-55f3-442f-a853-d3ce487d6778",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "a70b8473-0be4-491a-9641-682f8385b06d",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "forgot-password"
+ ],
+ "themeLayoutType": "Login",
+ "type": "view",
+ "viewType": "forgot-password"
}
--
Gitblit v1.9.1