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/home.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/home.json b/force-app/main/default/experiences/Consumable1/routes/home.json
index 281d363..309fa46 100644
--- a/force-app/main/default/experiences/Consumable1/routes/home.json
+++ b/force-app/main/default/experiences/Consumable1/routes/home.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "d22f1a01-e0a0-44df-b5e2-808abb2391f5",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "939c3a99-21d2-46b8-82dd-6713bce11e9c",
- "label": "Home",
- "pageAccess": "UseParent",
- "routeType": "home",
- "type": "route",
- "urlPrefix": ""
+ "activeViewId": "0b3166bc-2eec-43fa-8adf-532f629e9392",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "8e6532c1-df5e-4843-af7f-e01178398907",
+ "label": "Home",
+ "pageAccess": "UseParent",
+ "routeType": "home",
+ "type": "route",
+ "urlPrefix": ""
}
--
Gitblit v1.9.1