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/feedDetail.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/routes/feedDetail.json b/force-app/main/default/experiences/Partner21/routes/feedDetail.json
index 0f84119..074f2a1 100644
--- a/force-app/main/default/experiences/Partner21/routes/feedDetail.json
+++ b/force-app/main/default/experiences/Partner21/routes/feedDetail.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "c7ee8d3e-fb1b-4f58-8292-3ad0cc4824f9",
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "id": "983bfa20-13c3-42fb-a95e-1db14fb5340d",
- "label": "Feed Detail",
- "routeType": "feeditem-generic",
- "type": "route",
- "urlPrefix": "feed"
+ "activeViewId": "c7ee8d3e-fb1b-4f58-8292-3ad0cc4824f9",
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "id": "983bfa20-13c3-42fb-a95e-1db14fb5340d",
+ "label": "Feed Detail",
+ "routeType": "feeditem-generic",
+ "type": "route",
+ "urlPrefix": "feed"
}
--
Gitblit v1.9.1