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/学会・培训Detail.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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\255Detail.json" "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255Detail.json"
index 40164e1..b9f839e 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255Detail.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255Detail.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "d1ab2f20-ffeb-42ab-a74f-01c71e2d5e74",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "c195be57-9964-40c2-b12d-2836bd580514",
- "label": "瀛︿細銉诲煿璁� Detail",
- "routeType": "detail-701",
- "type": "route",
- "urlPrefix": "campaign"
+ "activeViewId": "d1ab2f20-ffeb-42ab-a74f-01c71e2d5e74",
+ "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+ "id": "c195be57-9964-40c2-b12d-2836bd580514",
+ "label": "瀛︿細銉诲煿璁� Detail",
+ "routeType": "detail-701",
+ "type": "route",
+ "urlPrefix": "campaign"
}
--
Gitblit v1.9.1