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/routes/loginError.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/loginError.json b/force-app/main/default/experiences/Consumable1/routes/loginError.json
index 4073fc5..d201a01 100644
--- a/force-app/main/default/experiences/Consumable1/routes/loginError.json
+++ b/force-app/main/default/experiences/Consumable1/routes/loginError.json
@@ -1,9 +1,9 @@
{
- "activeViewId" : "ba40442c-80fc-411f-8c02-9cfce2ab1372",
- "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
- "id" : "b0404c8e-8a84-4ed9-800b-93e742025cef",
- "label" : "Login Error",
- "routeType" : "login-error",
- "type" : "route",
- "urlPrefix" : "error"
-}
\ No newline at end of file
+ "activeViewId": "ba40442c-80fc-411f-8c02-9cfce2ab1372",
+ "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "id": "b0404c8e-8a84-4ed9-800b-93e742025cef",
+ "label": "Login Error",
+ "routeType": "login-error",
+ "type": "route",
+ "urlPrefix": "error"
+}
--
Gitblit v1.9.1