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/Partner21/routes/小组関連リスト.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/force-app/main/default/experiences/Partner21/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 2f5645a..db6a6c1 100644
--- "a/force-app/main/default/experiences/Partner21/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Partner21/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "2bfba25e-daf0-49ff-924f-f69f9d9fb327",
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "id": "5ca84e92-f681-451a-a465-c9ad81c9e4f4",
- "label": "灏忕粍 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-0F9",
- "type": "route",
- "urlPrefix": "group"
+ "activeViewId": "2bfba25e-daf0-49ff-924f-f69f9d9fb327",
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "id": "5ca84e92-f681-451a-a465-c9ad81c9e4f4",
+ "label": "灏忕粍 闁㈤�ｃ儶銈广儓",
+ "routeType": "relatedlist-0F9",
+ "type": "route",
+ "urlPrefix": "group"
}
--
Gitblit v1.9.1