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/Site3/routes/search.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Site3/routes/search.json b/force-app/main/default/experiences/Site3/routes/search.json
index c1fce47..cbd919b 100644
--- a/force-app/main/default/experiences/Site3/routes/search.json
+++ b/force-app/main/default/experiences/Site3/routes/search.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "1b73e50d-9811-4744-8c07-ffc097aa102a",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "05a1e535-f562-40c8-b5e5-e892d06167a8",
- "label": "Search",
- "pageAccess": "UseParent",
- "routeType": "global-search",
- "type": "route",
- "urlPrefix": "global-search"
+ "activeViewId": "1b73e50d-9811-4744-8c07-ffc097aa102a",
+ "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id": "05a1e535-f562-40c8-b5e5-e892d06167a8",
+ "label": "Search",
+ "pageAccess": "UseParent",
+ "routeType": "global-search",
+ "type": "route",
+ "urlPrefix": "global-search"
}
--
Gitblit v1.9.1