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_2.site-meta.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/sites/Consumable_2.site-meta.xml b/force-app/main/default/sites/Consumable_2.site-meta.xml
index daa5d65..97a3fc7 100644
--- a/force-app/main/default/sites/Consumable_2.site-meta.xml
+++ b/force-app/main/default/sites/Consumable_2.site-meta.xml
@@ -21,13 +21,13 @@
     <indexPage>CommunitiesLanding</indexPage>
     <masterLabel>Consumable绯荤粺2</masterLabel>
     <referrerPolicyOriginWhenCrossOrigin
-  >true</referrerPolicyOriginWhenCrossOrigin>
+    >true</referrerPolicyOriginWhenCrossOrigin>
     <requireHttps>true</requireHttps>
     <selfRegPage>CommunitiesSelfReg</selfRegPage>
     <serverIsDown>SNA_Consumable_21_sf_default_cdn_hOQ4J</serverIsDown>
     <siteAdmin>buli@deloitte.com.cn</siteAdmin>
     <siteGuestRecordDefaultOwner
-  >buli@deloitte.com.cn</siteGuestRecordDefaultOwner>
+    >buli@deloitte.com.cn</siteGuestRecordDefaultOwner>
     <siteType>ChatterNetwork</siteType>
     <subdomain>ocm</subdomain>
     <urlPathPrefix>consumable2</urlPathPrefix>

--
Gitblit v1.9.1