From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Partner21/routes/报表関連リスト.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/force-app/main/default/experiences/Partner21/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index bb6005c..b7a67a0 100644
--- "a/force-app/main/default/experiences/Partner21/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Partner21/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "217b4959-2595-4925-825f-0e46a2edf850",
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "id": "77fd078e-cd8f-476e-8bd7-556f21ad97d7",
- "label": "鎶ヨ〃 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-00O",
- "type": "route",
- "urlPrefix": "report"
+ "activeViewId": "217b4959-2595-4925-825f-0e46a2edf850",
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "id": "77fd078e-cd8f-476e-8bd7-556f21ad97d7",
+ "label": "鎶ヨ〃 闁㈤�ｃ儶銈广儓",
+ "routeType": "relatedlist-00O",
+ "type": "route",
+ "urlPrefix": "report"
}
--
Gitblit v1.9.1