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/Consumable_21/routes/topicCatalog.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/routes/topicCatalog.json b/force-app/main/default/experiences/Consumable_21/routes/topicCatalog.json
index a07712f..e7c28d3 100644
--- a/force-app/main/default/experiences/Consumable_21/routes/topicCatalog.json
+++ b/force-app/main/default/experiences/Consumable_21/routes/topicCatalog.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "beef814b-071b-4cc4-b306-273e36bcd4e1",
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "id": "78907806-e9ec-44d2-8cbd-4894911b6349",
- "label": "Topic Catalog",
- "pageAccess": "UseParent",
- "routeType": "topic-catalog",
- "type": "route",
- "urlPrefix": "topiccatalog"
+ "activeViewId": "beef814b-071b-4cc4-b306-273e36bcd4e1",
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "id": "78907806-e9ec-44d2-8cbd-4894911b6349",
+ "label": "Topic Catalog",
+ "pageAccess": "UseParent",
+ "routeType": "topic-catalog",
+ "type": "route",
+ "urlPrefix": "topiccatalog"
}
--
Gitblit v1.9.1