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/streamList.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/streamList.json b/force-app/main/default/experiences/Consumable1/routes/streamList.json
index 8a3eb9e..6b9571b 100644
--- a/force-app/main/default/experiences/Consumable1/routes/streamList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/streamList.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "6ef6f17a-0dda-4824-8310-e283e961890f",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "328d83cb-799e-47d6-af05-0f3b2cd704e4",
- "label": "Stream List",
- "routeType": "list-0Fq",
- "type": "route",
- "urlPrefix": "streams"
+ "activeViewId": "e1275716-f06a-4a27-a667-19c49eefb083",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "fa6fe95d-1642-4d25-8690-9b9a1504e9a0",
+ "label": "Stream List",
+ "routeType": "list-0Fq",
+ "type": "route",
+ "urlPrefix": "streams"
}
--
Gitblit v1.9.1