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/reportBuilder.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/routes/reportBuilder.json b/force-app/main/default/experiences/Consumable_21/routes/reportBuilder.json
index 9d68d60..bffbd19 100644
--- a/force-app/main/default/experiences/Consumable_21/routes/reportBuilder.json
+++ b/force-app/main/default/experiences/Consumable_21/routes/reportBuilder.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "eafc25fd-4415-48ab-bd26-616e299447aa",
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "id": "c43ac9aa-2c73-4a27-8ded-60f2d1566df0",
- "label": "Report Builder",
- "routeType": "createreport",
- "type": "route",
- "urlPrefix": "createreport"
+ "activeViewId": "eafc25fd-4415-48ab-bd26-616e299447aa",
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "id": "c43ac9aa-2c73-4a27-8ded-60f2d1566df0",
+ "label": "Report Builder",
+ "routeType": "createreport",
+ "type": "route",
+ "urlPrefix": "createreport"
}
--
Gitblit v1.9.1