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/Consumable系统2.network-meta.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/force-app/main/default/networks/Consumable\347\263\273\347\273\2372.network-meta.xml" "b/force-app/main/default/networks/Consumable\347\263\273\347\273\2372.network-meta.xml"
index 35d397f..d81a67e 100644
--- "a/force-app/main/default/networks/Consumable\347\263\273\347\273\2372.network-meta.xml"
+++ "b/force-app/main/default/networks/Consumable\347\263\273\347\273\2372.network-meta.xml"
@@ -3,10 +3,10 @@
<allowInternalUserLogin>true</allowInternalUserLogin>
<allowMembersToFlag>false</allowMembersToFlag>
<changePasswordTemplate
- >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+ >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
<communityRoles />
<disableReputationRecordConversations
- >true</disableReputationRecordConversations>
+ >true</disableReputationRecordConversations>
<emailSenderAddress>buli@deloitte.com.cn</emailSenderAddress>
<emailSenderName>Consumable绯荤粺2</emailSenderName>
<enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
@@ -27,7 +27,7 @@
<enableTopicSuggestions>false</enableTopicSuggestions>
<enableUpDownVote>false</enableUpDownVote>
<forgotPasswordTemplate
- >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+ >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
<gatherCustomerSentimentData>false</gatherCustomerSentimentData>
<networkMemberGroups>
<profile>admin</profile>
@@ -39,13 +39,13 @@
</networkMemberGroups>
<networkPageOverrides>
<changePasswordPageOverrideSetting
- >Standard</changePasswordPageOverrideSetting>
+ >Standard</changePasswordPageOverrideSetting>
<forgotPasswordPageOverrideSetting
- >Designer</forgotPasswordPageOverrideSetting>
+ >Designer</forgotPasswordPageOverrideSetting>
<homePageOverrideSetting>Standard</homePageOverrideSetting>
<loginPageOverrideSetting>Designer</loginPageOverrideSetting>
<selfRegProfilePageOverrideSetting
- >Designer</selfRegProfilePageOverrideSetting>
+ >Designer</selfRegProfilePageOverrideSetting>
</networkPageOverrides>
<picassoSite>Consumable_21</picassoSite>
<selfRegistration>false</selfRegistration>
@@ -58,5 +58,5 @@
</tabs>
<urlPathPrefix>consumable2</urlPathPrefix>
<welcomeTemplate
- >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+ >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
</Network>
--
Gitblit v1.9.1