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/experiences/Site3/config/loginAppPage.json |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/experiences/Site3/config/loginAppPage.json b/force-app/main/default/experiences/Site3/config/loginAppPage.json
index 5fd11c3..9aa7109 100644
--- a/force-app/main/default/experiences/Site3/config/loginAppPage.json
+++ b/force-app/main/default/experiences/Site3/config/loginAppPage.json
@@ -1,7 +1,7 @@
 {
-  "cmsSettings": {},
-  "id": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
-  "label": "login",
-  "templateName": "Login Template",
-  "type": "appPage"
+    "cmsSettings": {},
+    "id": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+    "label": "login",
+    "templateName": "Login Template",
+    "type": "appPage"
 }

--
Gitblit v1.9.1