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/Site.site-meta.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/sites/Site.site-meta.xml b/force-app/main/default/sites/Site.site-meta.xml
index 0852723..e13ecb3 100644
--- a/force-app/main/default/sites/Site.site-meta.xml
+++ b/force-app/main/default/sites/Site.site-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
<active>true</active>
<allowGuestPaymentsApi>false</allowGuestPaymentsApi>
@@ -21,7 +21,8 @@
<inactiveIndexPage>CommunitiesLogin</inactiveIndexPage>
<indexPage>TopPage</indexPage>
<masterLabel>娑堣�楀搧绠＄悊绯荤粺</masterLabel>
- <referrerPolicyOriginWhenCrossOrigin>false</referrerPolicyOriginWhenCrossOrigin>
+ <referrerPolicyOriginWhenCrossOrigin
+ >false</referrerPolicyOriginWhenCrossOrigin>
<requireHttps>true</requireHttps>
<selfRegPage>CommunitiesSelfReg</selfRegPage>
<siteAdmin>sb04@sb.com</siteAdmin>
--
Gitblit v1.9.1