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/Partner21/routes/reportList.json |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/experiences/Partner21/routes/reportList.json b/force-app/main/default/experiences/Partner21/routes/reportList.json
index bd97df3..af4a079 100644
--- a/force-app/main/default/experiences/Partner21/routes/reportList.json
+++ b/force-app/main/default/experiences/Partner21/routes/reportList.json
@@ -1,9 +1,9 @@
 {
-  "activeViewId": "94db8a50-134d-4517-bddc-eb54dc151c59",
-  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
-  "id": "a6c91f42-2b88-4b55-801a-62126c85bc28",
-  "label": "Report List",
-  "routeType": "list-00O",
-  "type": "route",
-  "urlPrefix": "report"
+    "activeViewId": "94db8a50-134d-4517-bddc-eb54dc151c59",
+    "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+    "id": "a6c91f42-2b88-4b55-801a-62126c85bc28",
+    "label": "Report List",
+    "routeType": "list-00O",
+    "type": "route",
+    "urlPrefix": "report"
 }

--
Gitblit v1.9.1