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/streamDetail.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/routes/streamDetail.json b/force-app/main/default/experiences/Partner21/routes/streamDetail.json
index 5f855f7..ed28163 100644
--- a/force-app/main/default/experiences/Partner21/routes/streamDetail.json
+++ b/force-app/main/default/experiences/Partner21/routes/streamDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "ef1f7586-66a3-4110-80c5-073271e404e6",
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "id": "10ad641a-4dac-4a97-907b-9829dbb0f4fa",
- "label": "Stream Detail",
- "routeType": "detail-0Fq",
- "type": "route",
- "urlPrefix": "streams"
+ "activeViewId": "ef1f7586-66a3-4110-80c5-073271e404e6",
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "id": "10ad641a-4dac-4a97-907b-9829dbb0f4fa",
+ "label": "Stream Detail",
+ "routeType": "detail-0Fq",
+ "type": "route",
+ "urlPrefix": "streams"
}
--
Gitblit v1.9.1