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/questionDetail.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/questionDetail.json b/force-app/main/default/experiences/Consumable1/routes/questionDetail.json
index 0e60ff7..4159f6e 100644
--- a/force-app/main/default/experiences/Consumable1/routes/questionDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/questionDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "d4ed7ed0-3745-461e-acd3-32108749ab93",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "a91ac3c9-aca5-4723-ae43-bc9c7f231015",
- "label": "Question Detail",
- "routeType": "feeditem",
- "type": "route",
- "urlPrefix": "question"
+ "activeViewId": "c29033d4-ea89-4311-9a8f-9b1cee010f96",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "d4e8748f-c126-4d7f-a4e8-43e4314bf361",
+ "label": "Question Detail",
+ "routeType": "feeditem",
+ "type": "route",
+ "urlPrefix": "question"
}
--
Gitblit v1.9.1