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/lexInventoryView.json | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json b/force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json
index 3451cf5..2c56e0c 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json
@@ -1,10 +1,10 @@
{
- "activeViewId" : "afb34dd9-404b-4bea-949d-07c42681d821",
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id" : "15de9dbd-a894-4fbc-8672-f2917c4addc5",
- "label" : "LexInventoryView",
- "pageAccess" : "UseParent",
- "routeType" : "custom-lexinventoryview",
- "type" : "route",
- "urlPrefix" : "lexinventoryview"
-}
\ No newline at end of file
+ "activeViewId": "afb34dd9-404b-4bea-949d-07c42681d821",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "15de9dbd-a894-4fbc-8672-f2917c4addc5",
+ "label": "LexInventoryView",
+ "pageAccess": "UseParent",
+ "routeType": "custom-lexinventoryview",
+ "type": "route",
+ "urlPrefix": "lexinventoryview"
+}
--
Gitblit v1.9.1