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/仪表板関連リスト.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 2a17a20..a0da898 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId" : "97ed2657-7949-4aed-9e5d-cae9c935f730",
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id" : "81c4ebfb-629e-4689-9783-133bf5187a7e",
- "label" : "浠〃鏉� 闁㈤�ｃ儶銈广儓",
- "routeType" : "relatedlist-01Z",
- "type" : "route",
- "urlPrefix" : "dashboard"
-}
\ No newline at end of file
+ "activeViewId": "97ed2657-7949-4aed-9e5d-cae9c935f730",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "81c4ebfb-629e-4689-9783-133bf5187a7e",
+ "label": "浠〃鏉� 闁㈤�ｃ儶銈广儓",
+ "routeType": "relatedlist-01Z",
+ "type": "route",
+ "urlPrefix": "dashboard"
+}
--
Gitblit v1.9.1