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/streamDetail.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/streamDetail.json b/force-app/main/default/experiences/Consumable1/routes/streamDetail.json
index 146807a..72dd66d 100644
--- a/force-app/main/default/experiences/Consumable1/routes/streamDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/streamDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId" : "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id" : "363f8c18-dff6-46a3-91c7-f574cc32b412",
- "label" : "Stream Detail",
- "routeType" : "detail-0Fq",
- "type" : "route",
- "urlPrefix" : "streams"
-}
\ No newline at end of file
+ "activeViewId": "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "363f8c18-dff6-46a3-91c7-f574cc32b412",
+ "label": "Stream Detail",
+ "routeType": "detail-0Fq",
+ "type": "route",
+ "urlPrefix": "streams"
+}
--
Gitblit v1.9.1