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/dashboardDetail.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json b/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json
index cf9c100..fd5933a 100644
--- a/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "4544a0e2-5ddb-49d0-b154-3903b3e7fb68",
- "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id": "7f941e81-8998-459a-a76b-93f5807e3db7",
- "label": "Dashboard Detail",
- "routeType": "detail-01Z",
- "type": "route",
- "urlPrefix": "dashboard"
+ "activeViewId": "4544a0e2-5ddb-49d0-b154-3903b3e7fb68",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "7f941e81-8998-459a-a76b-93f5807e3db7",
+ "label": "Dashboard Detail",
+ "routeType": "detail-01Z",
+ "type": "route",
+ "urlPrefix": "dashboard"
}
--
Gitblit v1.9.1