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/lexRemoveBox.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json b/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json
index ffa9997..1246488 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "8feef62c-b227-4815-b93f-fe0fe07a34bd",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "06d0bb54-97e9-4556-a6ee-5e9c7e34633a",
- "label": "LexRemoveBox",
- "pageAccess": "UseParent",
- "routeType": "custom-lexremovebox",
- "type": "route",
- "urlPrefix": "lexremovebox"
+ "activeViewId": "b4a2ba1b-3827-4ec7-8f8e-5461c3893ce0",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "f7bab43e-2170-4980-9b2c-126154272cb0",
+ "label": "LexRemoveBox",
+ "pageAccess": "UseParent",
+ "routeType": "custom-lexremovebox",
+ "type": "route",
+ "urlPrefix": "lexremovebox"
}
--
Gitblit v1.9.1