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/forgotPassword.json | 146 ++++++++++++++++++++++++------------------------
1 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/forgotPassword.json b/force-app/main/default/experiences/Consumable_21/views/forgotPassword.json
index 1cbe644..6ab20d5 100644
--- a/force-app/main/default/experiences/Consumable_21/views/forgotPassword.json
+++ b/force-app/main/default/experiences/Consumable_21/views/forgotPassword.json
@@ -1,79 +1,79 @@
{
- "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "a510a65f-dca4-40d1-9a3f-c54fa0216469",
- "label": "Forgot Password",
- "regions": [
- {
- "components": [
+ "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "a510a65f-dca4-40d1-9a3f-c54fa0216469",
+ "label": "Forgot Password",
+ "regions": [
{
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 22px; color: rgb(255, 255, 255);\">閲嶇疆瀵嗙爜</span></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "00626b2d-2d2d-4d87-bf08-4267058c8f26",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 22px; color: rgb(255, 255, 255);\">閲嶇疆瀵嗙爜</span></p>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "00626b2d-2d2d-4d87-bf08-4267058c8f26",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">璇疯緭鍏ユ偍鐨勭敤鎴峰悕</span></p>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "b94d860f-947e-4945-8c4c-b2f3cd66c9ba",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "checkEmailUrl": "./CheckPasswordResetEmail",
+ "submitButtonLabel": "閲嶇疆瀵嗙爜",
+ "usernameLabel": "鐢ㄦ埛鍚�"
+ },
+ "componentName": "salesforceIdentity:forgotPassword2",
+ "id": "02c6d7c6-70b5-4dfe-bb64-428302610ecd",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "richTextValue": "<p style=\"text-align: center;\"><a href=\"./\" rel=\"noopener noreferrer\" target=\"_blank\" style=\"color: rgb(255, 255, 255);\">鍙栨秷</a></p>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "3557095c-4f38-47e6-8bc0-79a7267ba62d",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "3c8d4ae3-e30f-47b6-a15f-b19507127941",
+ "regionName": "content",
+ "type": "region"
},
{
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">璇疯緭鍏ユ偍鐨勭敤鎴峰悕</span></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "b94d860f-947e-4945-8c4c-b2f3cd66c9ba",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "checkEmailUrl": "./CheckPasswordResetEmail",
- "submitButtonLabel": "閲嶇疆瀵嗙爜",
- "usernameLabel": "鐢ㄦ埛鍚�"
- },
- "componentName": "salesforceIdentity:forgotPassword2",
- "id": "02c6d7c6-70b5-4dfe-bb64-428302610ecd",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "richTextValue": "<p style=\"text-align: center;\"><a href=\"./\" rel=\"noopener noreferrer\" target=\"_blank\" style=\"color: rgb(255, 255, 255);\">鍙栨秷</a></p>"
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "3557095c-4f38-47e6-8bc0-79a7267ba62d",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Forgot Password"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "1fd5a5ef-20b4-457e-b33c-2e4b64d08e75",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "35d35915-02ae-458d-b2fe-831363621638",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "3c8d4ae3-e30f-47b6-a15f-b19507127941",
- "regionName": "content",
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "Forgot Password"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "1fd5a5ef-20b4-457e-b33c-2e4b64d08e75",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "35d35915-02ae-458d-b2fe-831363621638",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Login",
- "type": "view",
- "viewType": "forgot-password"
+ ],
+ "themeLayoutType": "Login",
+ "type": "view",
+ "viewType": "forgot-password"
}
--
Gitblit v1.9.1