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/Consumable_21/routes/lexArriveGoodsMain.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/routes/lexArriveGoodsMain.json b/force-app/main/default/experiences/Consumable_21/routes/lexArriveGoodsMain.json
index db645f8..261834c 100644
--- a/force-app/main/default/experiences/Consumable_21/routes/lexArriveGoodsMain.json
+++ b/force-app/main/default/experiences/Consumable_21/routes/lexArriveGoodsMain.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "5229d999-bdf4-4629-9b67-0d0803232c20",
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "id": "3b8d893a-f328-44e0-afd4-6a754659deee",
- "label": "LexArriveGoodsMain",
- "pageAccess": "UseParent",
- "routeType": "custom-lexarrivegoodsmain",
- "type": "route",
- "urlPrefix": "lexarrivegoodsmain"
+ "activeViewId": "5229d999-bdf4-4629-9b67-0d0803232c20",
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "id": "3b8d893a-f328-44e0-afd4-6a754659deee",
+ "label": "LexArriveGoodsMain",
+ "pageAccess": "UseParent",
+ "routeType": "custom-lexarrivegoodsmain",
+ "type": "route",
+ "urlPrefix": "lexarrivegoodsmain"
}
--
Gitblit v1.9.1