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/topicDetail.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/topicDetail.json b/force-app/main/default/experiences/Consumable1/routes/topicDetail.json
index e83118e..b724f27 100644
--- a/force-app/main/default/experiences/Consumable1/routes/topicDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/topicDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId" : "060ff5da-04b3-49de-8fb8-03decd8c188c",
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id" : "8a6adaa6-3a66-4924-aae5-ea1120239b86",
- "label" : "Topic Detail",
- "routeType" : "topic",
- "type" : "route",
- "urlPrefix" : "topic"
-}
\ No newline at end of file
+ "activeViewId": "060ff5da-04b3-49de-8fb8-03decd8c188c",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "8a6adaa6-3a66-4924-aae5-ea1120239b86",
+ "label": "Topic Detail",
+ "routeType": "topic",
+ "type": "route",
+ "urlPrefix": "topic"
+}
--
Gitblit v1.9.1