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/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\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\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 4c030ed..2abfe4b 100644
--- "a/force-app/main/default/experiences/Partner21/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\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\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "c151821c-4405-4da0-b2dd-279fbb65bd86",
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "id": "2e701358-38dd-4068-b3ab-8d91cac9d359",
- "label": "瀛︿細銉诲煿璁� 闁㈤�ｃ儶銈广儓",
- "routeType": "relatedlist-701",
- "type": "route",
- "urlPrefix": "campaign"
+ "activeViewId": "c151821c-4405-4da0-b2dd-279fbb65bd86",
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "id": "2e701358-38dd-4068-b3ab-8d91cac9d359",
+ "label": "瀛︿細銉诲煿璁� 闁㈤�ｃ儶銈广儓",
+ "routeType": "relatedlist-701",
+ "type": "route",
+ "urlPrefix": "campaign"
}
--
Gitblit v1.9.1