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/sites/Consumable.site-meta.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/sites/Consumable.site-meta.xml b/force-app/main/default/sites/Consumable.site-meta.xml
index c202c1c..e4c1c1d 100644
--- a/force-app/main/default/sites/Consumable.site-meta.xml
+++ b/force-app/main/default/sites/Consumable.site-meta.xml
@@ -21,13 +21,13 @@
     <indexPage>CommunitiesLanding</indexPage>
     <masterLabel>Consumable绯荤粺</masterLabel>
     <referrerPolicyOriginWhenCrossOrigin
-  >true</referrerPolicyOriginWhenCrossOrigin>
+    >true</referrerPolicyOriginWhenCrossOrigin>
     <requireHttps>true</requireHttps>
     <selfRegPage>CommunitiesSelfReg</selfRegPage>
-    <serverIsDown>SNA_Demo1_sf_default_cdn_PqhAN</serverIsDown>
-    <siteAdmin>linktan@deloitte.com.olympus</siteAdmin>
+    <serverIsDown>SNA_Consumable1_sf_default_cdn_Cpit8</serverIsDown>
+    <siteAdmin>buli@deloitte.com.cn</siteAdmin>
     <siteGuestRecordDefaultOwner
-  >linktan@deloitte.com.olympus</siteGuestRecordDefaultOwner>
+    >buli@deloitte.com.cn</siteGuestRecordDefaultOwner>
     <siteType>ChatterNetwork</siteType>
     <subdomain>ocm</subdomain>
     <urlPathPrefix>consumable</urlPathPrefix>

--
Gitblit v1.9.1