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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/config/loginAppPage.json b/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
index 8ac0de4..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": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "label": "login",
- "templateName": "Login Template",
- "type": "appPage"
+ "cmsSettings": {},
+ "id": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "label": "login",
+ "templateName": "Login Template",
+ "type": "appPage"
}
--
Gitblit v1.9.1