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/Consumable1/views/userSettings.json | 112 ++++++++++++++++++++++++++++----------------------------
1 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/userSettings.json b/force-app/main/default/experiences/Consumable1/views/userSettings.json
index 39db8cb..ee1a522 100644
--- a/force-app/main/default/experiences/Consumable1/views/userSettings.json
+++ b/force-app/main/default/experiences/Consumable1/views/userSettings.json
@@ -1,60 +1,60 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "55bd4245-fde3-4919-8a43-b7e2ffc3aed7",
- "label": "User Settings",
- "regions": [
- {
- "id": "661a308a-163f-4685-aec7-5d617a450359",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "8225f2be-2536-4868-afe9-ed11e1c1eb15",
+ "label": "User Settings",
+ "regions": [
{
- "componentAttributes": {
- "accountSectionTitle": "Account",
- "accountTabName": "Account Management",
- "connectedSourcesTabName": "Connected Sources",
- "deleteAccountButtonTitle": "Deactivate My Account",
- "deleteAccountConfirmationPopupBody": "After you deactivate your account, you'll lose access to this site.",
- "deleteAccountConfirmationPopupButtonTitle": "Got It",
- "deleteAccountConfirmationPopupTitle": "Deactivate your account?",
- "deleteAccountErrorMessage": "Something went wrong. Contact your site administrator.",
- "deleteAccountSectionTitle": "Deactivate Account",
- "emailNotificationsTitle": "Email Notifications",
- "emailSectionDescText": "When email notifications are enabled, email me when someone:",
- "hideAccountDeleteSection": true,
- "hideChatterNotificationSettings": false,
- "hideConnectedSources": false,
- "hideEmailNotificationSettings": false,
- "hideProfileVisibilitySettings": false,
- "id": "{!recordId}",
- "locationTitle": "Location",
- "profileSectionDescText": "Customize who is able to see what on your profile page",
- "profileSectionToolTipText": "Restricted: Visible to the employees of the company that created the site. Members: Visible to logged-in members. Public: Visible to anyone viewing pages that don't require login.",
- "profileVisibilityTitle": "Profile Visibility",
- "settingsPageTitle": "My Settings"
- },
- "componentName": "forceCommunity:userSettingsCustomizable",
- "id": "1a67d89b-1f40-4cd5-ac5b-c655aa5043ee",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "0e29e12f-82e2-4770-9056-00412cb4914b",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "accountSectionTitle": "Account",
+ "accountTabName": "Account Management",
+ "connectedSourcesTabName": "Connected Sources",
+ "deleteAccountButtonTitle": "Deactivate My Account",
+ "deleteAccountConfirmationPopupBody": "After you deactivate your account, you'll lose access to this site.",
+ "deleteAccountConfirmationPopupButtonTitle": "Got It",
+ "deleteAccountConfirmationPopupTitle": "Deactivate your account?",
+ "deleteAccountErrorMessage": "Something went wrong. Contact your site administrator.",
+ "deleteAccountSectionTitle": "Deactivate Account",
+ "emailNotificationsTitle": "Email Notifications",
+ "emailSectionDescText": "When email notifications are enabled, email me when someone:",
+ "hideAccountDeleteSection": true,
+ "hideChatterNotificationSettings": false,
+ "hideConnectedSources": false,
+ "hideEmailNotificationSettings": false,
+ "hideProfileVisibilitySettings": false,
+ "id": "{!recordId}",
+ "locationTitle": "Location",
+ "profileSectionDescText": "Customize who is able to see what on your profile page",
+ "profileSectionToolTipText": "Restricted: Visible to the employees of the company that created the site. Members: Visible to logged-in members. Public: Visible to anyone viewing pages that don't require login.",
+ "profileVisibilityTitle": "Profile Visibility",
+ "settingsPageTitle": "My Settings"
+ },
+ "componentName": "forceCommunity:userSettingsCustomizable",
+ "id": "be9a963a-9ad1-4190-845c-c1f479b4c9f2",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "7eb02000-7cb9-48f9-8463-eae4dfa60e4c",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "f99dd3f8-ab5f-49e4-b57e-b51dc2ab9ccd",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "c3d59adc-a0ce-40a8-85de-f06d2a758226",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "455997bb-5cc3-45cf-9da7-0a28c22be1f5",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "usersettings"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "usersettings"
}
--
Gitblit v1.9.1