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/myAccount.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/routes/myAccount.json b/force-app/main/default/experiences/Partner21/routes/myAccount.json
index 0d1ec36..c656106 100644
--- a/force-app/main/default/experiences/Partner21/routes/myAccount.json
+++ b/force-app/main/default/experiences/Partner21/routes/myAccount.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "4f2502be-3471-4328-98e2-65da8b475fba",
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "id": "5c4c7d56-84cd-449f-b860-2ae61fc89b74",
- "label": "My Account",
- "routeType": "my-account",
- "type": "route",
- "urlPrefix": "comm-my-account"
+ "activeViewId": "4f2502be-3471-4328-98e2-65da8b475fba",
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "id": "5c4c7d56-84cd-449f-b860-2ae61fc89b74",
+ "label": "My Account",
+ "routeType": "my-account",
+ "type": "route",
+ "urlPrefix": "comm-my-account"
}
--
Gitblit v1.9.1