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/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
index dac1f99..b40bf4c 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
@@ -1,9 +1,9 @@
{
- "activeViewId" : "09574ae1-7a1d-465b-852b-6604abee87c2",
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id" : "f61977d4-a8e8-4f2f-b5d3-52b1e7398240",
- "label" : "鐢ㄦ埛 銉偣銉�",
- "routeType" : "list-005",
- "type" : "route",
- "urlPrefix" : "profile"
-}
\ No newline at end of file
+ "activeViewId": "09574ae1-7a1d-465b-852b-6604abee87c2",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "f61977d4-a8e8-4f2f-b5d3-52b1e7398240",
+ "label": "鐢ㄦ埛 銉偣銉�",
+ "routeType": "list-005",
+ "type": "route",
+ "urlPrefix": "profile"
+}
--
Gitblit v1.9.1