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/lexConsumable.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/routes/lexConsumable.json b/force-app/main/default/experiences/Consumable_21/routes/lexConsumable.json
index 9ed218e..df49104 100644
--- a/force-app/main/default/experiences/Consumable_21/routes/lexConsumable.json
+++ b/force-app/main/default/experiences/Consumable_21/routes/lexConsumable.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "ba77614e-6f6b-4e0f-95b1-7f08a6b87196",
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "id": "bb299531-bfb2-42e2-9aac-9292440c2908",
- "label": "LexConsumable",
- "pageAccess": "UseParent",
- "routeType": "custom-lexconsumable",
- "type": "route",
- "urlPrefix": "lexconsumable"
+ "activeViewId": "ba77614e-6f6b-4e0f-95b1-7f08a6b87196",
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "id": "bb299531-bfb2-42e2-9aac-9292440c2908",
+ "label": "LexConsumable",
+ "pageAccess": "UseParent",
+ "routeType": "custom-lexconsumable",
+ "type": "route",
+ "urlPrefix": "lexconsumable"
}
--
Gitblit v1.9.1