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/Consumable1/config/loginAppPage.json | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/config/loginAppPage.json b/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
index 04f6dcf..d7226e8 100644
--- a/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
+++ b/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
@@ -1,7 +1,7 @@
{
- "cmsSettings" : { },
- "id" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
- "label" : "login",
- "templateName" : "Login Template",
- "type" : "appPage"
-}
\ No newline at end of file
+ "cmsSettings": {},
+ "id": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "label": "login",
+ "templateName": "Login Template",
+ "type": "appPage"
+}
--
Gitblit v1.9.1