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/Consumable_21/routes/loginError.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/routes/loginError.json b/force-app/main/default/experiences/Consumable_21/routes/loginError.json
index 194e2af..65f6e96 100644
--- a/force-app/main/default/experiences/Consumable_21/routes/loginError.json
+++ b/force-app/main/default/experiences/Consumable_21/routes/loginError.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "98860cc1-5078-4acf-adfa-a3eae3c02cea",
- "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
- "id": "85e27f5f-87b6-459f-b703-0e7927c1ce7b",
- "label": "Login Error",
- "routeType": "login-error",
- "type": "route",
- "urlPrefix": "error"
+ "activeViewId": "98860cc1-5078-4acf-adfa-a3eae3c02cea",
+ "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
+ "id": "85e27f5f-87b6-459f-b703-0e7927c1ce7b",
+ "label": "Login Error",
+ "routeType": "login-error",
+ "type": "route",
+ "urlPrefix": "error"
}
--
Gitblit v1.9.1