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 | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 d5087b3..4141c9a 100644
--- a/force-app/main/default/networks/Partner Sales.network-meta.xml
+++ b/force-app/main/default/networks/Partner Sales.network-meta.xml
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Network xmlns="http://soap.sforce.com/2006/04/metadata">
<allowInternalUserLogin>true</allowInternalUserLogin>
<allowMembersToFlag>false</allowMembersToFlag>
- <changePasswordTemplate>unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
- <communityRoles/>
- <disableReputationRecordConversations>false</disableReputationRecordConversations>
+ <changePasswordTemplate
+ >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+ <communityRoles />
+ <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>
@@ -24,7 +26,8 @@
<enableTopicAssignmentRules>false</enableTopicAssignmentRules>
<enableTopicSuggestions>true</enableTopicSuggestions>
<enableUpDownVote>false</enableUpDownVote>
- <forgotPasswordTemplate>unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+ <forgotPasswordTemplate
+ >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
<gatherCustomerSentimentData>false</gatherCustomerSentimentData>
<networkMemberGroups>
<permissionSet>P002_Partner</permissionSet>
@@ -33,11 +36,14 @@
<profile>901_缁忛攢鍟嗘椿鍔ㄧ郴缁�</profile>
</networkMemberGroups>
<networkPageOverrides>
- <changePasswordPageOverrideSetting>Standard</changePasswordPageOverrideSetting>
- <forgotPasswordPageOverrideSetting>Standard</forgotPasswordPageOverrideSetting>
+ <changePasswordPageOverrideSetting
+ >Standard</changePasswordPageOverrideSetting>
+ <forgotPasswordPageOverrideSetting
+ >Standard</forgotPasswordPageOverrideSetting>
<homePageOverrideSetting>Designer</homePageOverrideSetting>
<loginPageOverrideSetting>Designer</loginPageOverrideSetting>
- <selfRegProfilePageOverrideSetting>Designer</selfRegProfilePageOverrideSetting>
+ <selfRegProfilePageOverrideSetting
+ >Designer</selfRegProfilePageOverrideSetting>
</networkPageOverrides>
<picassoSite>Partner_Sales1</picassoSite>
<selfRegistration>false</selfRegistration>
@@ -49,5 +55,6 @@
<standardTab>Chatter</standardTab>
</tabs>
<urlPathPrefix>partner</urlPathPrefix>
- <welcomeTemplate>unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+ <welcomeTemplate
+ >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
</Network>
--
Gitblit v1.9.1