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/\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/Consumable1/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 60fd0f8..871af59 100644
--- "a/force-app/main/default/experiences/Consumable1/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/Consumable1/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" : "4cf18bf4-7c54-4746-b895-ec877e8fcd43",
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id" : "663d23a2-f828-41e4-b9eb-d9c9dfaceb4d",
- "label" : "瀛︿細銉诲煿璁� 闁㈤�ｃ儶銈广儓",
- "routeType" : "relatedlist-701",
- "type" : "route",
- "urlPrefix" : "campaign"
-}
\ No newline at end of file
+ "activeViewId": "4cf18bf4-7c54-4746-b895-ec877e8fcd43",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "663d23a2-f828-41e4-b9eb-d9c9dfaceb4d",
+ "label": "瀛︿細銉诲煿璁� 闁㈤�ｃ儶銈广儓",
+ "routeType": "relatedlist-701",
+ "type": "route",
+ "urlPrefix": "campaign"
+}
--
Gitblit v1.9.1