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/Partner21/routes/用户リスト.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
index dd07f31..1695f75 100644
--- "a/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId": "33b1c4cb-6778-4461-9977-a79f65eb2665",
- "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
- "id": "bc57eb02-e26e-4855-86b9-bd3369fddb36",
- "label": "鐢ㄦ埛 銉偣銉�",
- "routeType": "list-005",
- "type": "route",
- "urlPrefix": "profile"
+ "activeViewId": "33b1c4cb-6778-4461-9977-a79f65eb2665",
+ "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+ "id": "bc57eb02-e26e-4855-86b9-bd3369fddb36",
+ "label": "鐢ㄦ埛 銉偣銉�",
+ "routeType": "list-005",
+ "type": "route",
+ "urlPrefix": "profile"
}
--
Gitblit v1.9.1