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/lexConsumableAccount.json |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json
index 6f277a8..9c4ff72 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json
@@ -1,10 +1,10 @@
 {
-  "activeViewId": "f724180a-789f-4a5f-909f-a3b6926cff21",
-  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
-  "id": "790c190b-8bf4-4211-a8fb-172af3538e9f",
-  "label": "LexConsumableAccount",
-  "pageAccess": "UseParent",
-  "routeType": "custom-lexconsumableaccount",
-  "type": "route",
-  "urlPrefix": "lexconsumableaccount"
+    "activeViewId": "65a5c9a4-0cc9-4b00-872b-b90bc1e47411",
+    "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+    "id": "7db2303f-7e83-4c85-a7ad-12fa6672974b",
+    "label": "LexConsumableAccount",
+    "pageAccess": "UseParent",
+    "routeType": "custom-lexconsumableaccount",
+    "type": "route",
+    "urlPrefix": "lexconsumableaccount"
 }

--
Gitblit v1.9.1