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/Consumable1/routes/lexTopPage.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json b/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json
index 4f76731..ad5e78b 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "bda75bd7-499d-4d41-ad47-2d49173854dd",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "146bed7f-b8f1-4016-8a31-035874516b5d",
- "label": "lexTopPage",
- "pageAccess": "UseParent",
- "routeType": "custom-lextoppage",
- "type": "route",
- "urlPrefix": "lextoppage"
+ "activeViewId": "09c93676-a531-4ba7-8708-cc47f8458c90",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "855eeb08-6e57-404b-a5f6-072349535002",
+ "label": "LexTopPage",
+ "pageAccess": "UseParent",
+ "routeType": "custom-lextoppage",
+ "type": "route",
+ "urlPrefix": "lextoppage"
}
--
Gitblit v1.9.1