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/error.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Site3/routes/error.json b/force-app/main/default/experiences/Site3/routes/error.json
index ea9cbeb..31a07c5 100644
--- a/force-app/main/default/experiences/Site3/routes/error.json
+++ b/force-app/main/default/experiences/Site3/routes/error.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "c792b011-93b7-4274-aa53-359303ca2567",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "c684094f-3175-42c3-9fab-eb858aa3e806",
- "label": "Error",
- "pageAccess": "UseParent",
- "routeType": "error",
- "type": "route",
- "urlPrefix": "error"
+ "activeViewId": "c792b011-93b7-4274-aa53-359303ca2567",
+ "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id": "c684094f-3175-42c3-9fab-eb858aa3e806",
+ "label": "Error",
+ "pageAccess": "UseParent",
+ "routeType": "error",
+ "type": "route",
+ "urlPrefix": "error"
}
--
Gitblit v1.9.1