From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Partner21/routes/userProfile.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/routes/userProfile.json b/force-app/main/default/experiences/Partner21/routes/userProfile.json
index 1fcc151..7007fc7 100644
--- a/force-app/main/default/experiences/Partner21/routes/userProfile.json
+++ b/force-app/main/default/experiences/Partner21/routes/userProfile.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "4053070a-c5f6-483a-b96a-0ac64d32bfc6",
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "id": "9f4260e2-fbc6-42b4-bebe-8886bcd55e66",
- "label": "User Profile",
- "routeType": "detail-005",
- "type": "route",
- "urlPrefix": "profile"
+ "activeViewId": "4053070a-c5f6-483a-b96a-0ac64d32bfc6",
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "id": "9f4260e2-fbc6-42b4-bebe-8886bcd55e66",
+ "label": "User Profile",
+ "routeType": "detail-005",
+ "type": "route",
+ "urlPrefix": "profile"
}
--
Gitblit v1.9.1