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/userSettings.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/routes/userSettings.json b/force-app/main/default/experiences/Consumable_21/routes/userSettings.json
index 1e1a098..8a4fa7e 100644
--- a/force-app/main/default/experiences/Consumable_21/routes/userSettings.json
+++ b/force-app/main/default/experiences/Consumable_21/routes/userSettings.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "c3057516-9b03-4f0d-97b8-17a86dbc1ec8",
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "id": "d012918b-1353-4e46-adfe-ab69e9c8f0ac",
- "label": "User Settings",
- "routeType": "usersettings",
- "type": "route",
- "urlPrefix": "settings"
+ "activeViewId": "c3057516-9b03-4f0d-97b8-17a86dbc1ec8",
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "id": "d012918b-1353-4e46-adfe-ab69e9c8f0ac",
+ "label": "User Settings",
+ "routeType": "usersettings",
+ "type": "route",
+ "urlPrefix": "settings"
}
--
Gitblit v1.9.1