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/networks/Partner Sales.network-meta.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/networks/Partner Sales.network-meta.xml b/force-app/main/default/networks/Partner Sales.network-meta.xml
index 08d1a2b..4141c9a 100644
--- a/force-app/main/default/networks/Partner Sales.network-meta.xml
+++ b/force-app/main/default/networks/Partner Sales.network-meta.xml
@@ -3,21 +3,21 @@
<allowInternalUserLogin>true</allowInternalUserLogin>
<allowMembersToFlag>false</allowMembersToFlag>
<changePasswordTemplate
- >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+ >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
<communityRoles />
<disableReputationRecordConversations
- >false</disableReputationRecordConversations>
+ >false</disableReputationRecordConversations>
<emailSenderAddress>olympussupport@sunbridge.com</emailSenderAddress>
<emailSenderName>Partner Sales</emailSenderName>
<enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
<enableDirectMessages>false</enableDirectMessages>
- <enableGuestChatter>false</enableGuestChatter>
+ <enableGuestChatter>true</enableGuestChatter>
<enableGuestFileAccess>true</enableGuestFileAccess>
<enableGuestMemberVisibility>false</enableGuestMemberVisibility>
<enableInvitation>false</enableInvitation>
<enableKnowledgeable>false</enableKnowledgeable>
<enableMemberVisibility>true</enableMemberVisibility>
- <enableNicknameDisplay>true</enableNicknameDisplay>
+ <enableNicknameDisplay>false</enableNicknameDisplay>
<enablePrivateMessages>false</enablePrivateMessages>
<enableReputation>false</enableReputation>
<enableShowAllNetworkSettings>true</enableShowAllNetworkSettings>
@@ -27,7 +27,7 @@
<enableTopicSuggestions>true</enableTopicSuggestions>
<enableUpDownVote>false</enableUpDownVote>
<forgotPasswordTemplate
- >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+ >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
<gatherCustomerSentimentData>false</gatherCustomerSentimentData>
<networkMemberGroups>
<permissionSet>P002_Partner</permissionSet>
@@ -37,13 +37,13 @@
</networkMemberGroups>
<networkPageOverrides>
<changePasswordPageOverrideSetting
- >Standard</changePasswordPageOverrideSetting>
+ >Standard</changePasswordPageOverrideSetting>
<forgotPasswordPageOverrideSetting
- >Standard</forgotPasswordPageOverrideSetting>
+ >Standard</forgotPasswordPageOverrideSetting>
<homePageOverrideSetting>Designer</homePageOverrideSetting>
<loginPageOverrideSetting>Designer</loginPageOverrideSetting>
<selfRegProfilePageOverrideSetting
- >Designer</selfRegProfilePageOverrideSetting>
+ >Designer</selfRegProfilePageOverrideSetting>
</networkPageOverrides>
<picassoSite>Partner_Sales1</picassoSite>
<selfRegistration>false</selfRegistration>
@@ -56,5 +56,5 @@
</tabs>
<urlPathPrefix>partner</urlPathPrefix>
<welcomeTemplate
- >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+ >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
</Network>
--
Gitblit v1.9.1