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/文件RelatedList.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266RelatedList.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266RelatedList.json"
index f00add9..24c9ea1 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266RelatedList.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266RelatedList.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "74713a2e-dcbc-464b-a87a-d1231dc118a2",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "a6a5ab12-e9b1-4fc0-9fdf-a9142ef22669",
- "label": "鏂囦欢 Related List",
- "routeType": "relatedlist-069",
- "type": "route",
- "urlPrefix": "contentdocument"
+ "activeViewId": "74713a2e-dcbc-464b-a87a-d1231dc118a2",
+ "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+ "id": "a6a5ab12-e9b1-4fc0-9fdf-a9142ef22669",
+ "label": "鏂囦欢 Related List",
+ "routeType": "relatedlist-069",
+ "type": "route",
+ "urlPrefix": "contentdocument"
}
--
Gitblit v1.9.1