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/Consumable1/routes/userSettings.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/userSettings.json b/force-app/main/default/experiences/Consumable1/routes/userSettings.json
index 4a75f07..53f6d3a 100644
--- a/force-app/main/default/experiences/Consumable1/routes/userSettings.json
+++ b/force-app/main/default/experiences/Consumable1/routes/userSettings.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "8225f2be-2536-4868-afe9-ed11e1c1eb15",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "cf47d325-829c-4ce7-a2b3-2440777f63c4",
- "label": "User Settings",
- "routeType": "usersettings",
- "type": "route",
- "urlPrefix": "settings"
+ "activeViewId": "8225f2be-2536-4868-afe9-ed11e1c1eb15",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "cf47d325-829c-4ce7-a2b3-2440777f63c4",
+ "label": "User Settings",
+ "routeType": "usersettings",
+ "type": "route",
+ "urlPrefix": "settings"
}
--
Gitblit v1.9.1