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/Site3/routes/forgotPassword.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Site3/routes/forgotPassword.json b/force-app/main/default/experiences/Site3/routes/forgotPassword.json
index c019c71..3135323 100644
--- a/force-app/main/default/experiences/Site3/routes/forgotPassword.json
+++ b/force-app/main/default/experiences/Site3/routes/forgotPassword.json
@@ -1,9 +1,9 @@
{
- "activeViewId" : "cb26bb2a-86d2-4d95-813b-a1b4e00337e5",
- "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "id" : "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
- "label" : "Forgot Password",
- "routeType" : "forgot-password",
- "type" : "route",
- "urlPrefix" : "ForgotPassword"
-}
\ No newline at end of file
+ "activeViewId": "cb26bb2a-86d2-4d95-813b-a1b4e00337e5",
+ "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "id": "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
+ "label": "Forgot Password",
+ "routeType": "forgot-password",
+ "type": "route",
+ "urlPrefix": "ForgotPassword"
+}
--
Gitblit v1.9.1