From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Consumable1/routes/login.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/login.json b/force-app/main/default/experiences/Consumable1/routes/login.json
index 7928006..ba5b401 100644
--- a/force-app/main/default/experiences/Consumable1/routes/login.json
+++ b/force-app/main/default/experiences/Consumable1/routes/login.json
@@ -1,9 +1,9 @@
{
- "activeViewId" : "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
- "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
- "id" : "c7457673-c277-4525-81e4-00da62b21ee0",
- "label" : "Login",
- "routeType" : "login-home",
- "type" : "route",
- "urlPrefix" : ""
-}
\ No newline at end of file
+ "activeViewId": "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
+ "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "id": "c7457673-c277-4525-81e4-00da62b21ee0",
+ "label": "Login",
+ "routeType": "login-home",
+ "type": "route",
+ "urlPrefix": ""
+}
--
Gitblit v1.9.1