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\265\201\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\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 45fc2cc..e25e36e 100644
--- "a/force-app/main/default/experiences/Partner21/routes/\346\265\201\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\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "cc7589b2-7f8c-4682-9007-5aa6a8b4c110",
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "id": "905b3765-bfbf-4204-9356-e13233d56dd7",
- "label": "娴� 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-0Fq",
- "type": "route",
- "urlPrefix": "streams"
+ "activeViewId": "cc7589b2-7f8c-4682-9007-5aa6a8b4c110",
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "id": "905b3765-bfbf-4204-9356-e13233d56dd7",
+ "label": "娴� 闁㈤�ｃ儶銈广儓",
+ "routeType": "relatedlist-0Fq",
+ "type": "route",
+ "urlPrefix": "streams"
}
--
Gitblit v1.9.1