From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Consumable1/routes/error.json | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/error.json b/force-app/main/default/experiences/Consumable1/routes/error.json
index 82d3dd7..7c6cc60 100644
--- a/force-app/main/default/experiences/Consumable1/routes/error.json
+++ b/force-app/main/default/experiences/Consumable1/routes/error.json
@@ -1,10 +1,10 @@
{
- "activeViewId" : "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id" : "2d27ac00-e60f-444a-8627-23c58e43d9ad",
- "label" : "Error",
- "pageAccess" : "UseParent",
- "routeType" : "error",
- "type" : "route",
- "urlPrefix" : "error"
-}
\ No newline at end of file
+ "activeViewId": "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "2d27ac00-e60f-444a-8627-23c58e43d9ad",
+ "label": "Error",
+ "pageAccess": "UseParent",
+ "routeType": "error",
+ "type": "route",
+ "urlPrefix": "error"
+}
--
Gitblit v1.9.1