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/用户List.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267List.json" "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267List.json"
index 9850d46..3d98d11 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267List.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267List.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "ef48fff2-c579-4f2a-971d-251b61fd786e",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "43d97466-c6d8-41c4-b93a-c0fccb403e19",
- "label": "鐢ㄦ埛 List",
- "routeType": "list-005",
- "type": "route",
- "urlPrefix": "profile"
+ "activeViewId": "ef48fff2-c579-4f2a-971d-251b61fd786e",
+ "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+ "id": "43d97466-c6d8-41c4-b93a-c0fccb403e19",
+ "label": "鐢ㄦ埛 List",
+ "routeType": "list-005",
+ "type": "route",
+ "urlPrefix": "profile"
}
--
Gitblit v1.9.1