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/Partner21/routes/login.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/routes/login.json b/force-app/main/default/experiences/Partner21/routes/login.json
index e030a0d..2f8ce25 100644
--- a/force-app/main/default/experiences/Partner21/routes/login.json
+++ b/force-app/main/default/experiences/Partner21/routes/login.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "6a024f98-3cde-4f9a-8648-4fd1e841d503",
- "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
- "id": "537d03d3-4bd8-4207-bf3f-0309e45225e5",
- "label": "Login",
- "routeType": "login-home",
- "type": "route",
- "urlPrefix": ""
+ "activeViewId": "6a024f98-3cde-4f9a-8648-4fd1e841d503",
+ "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+ "id": "537d03d3-4bd8-4207-bf3f-0309e45225e5",
+ "label": "Login",
+ "routeType": "login-home",
+ "type": "route",
+ "urlPrefix": ""
}
--
Gitblit v1.9.1