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/userProfile.json |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/experiences/Consumable1/routes/userProfile.json b/force-app/main/default/experiences/Consumable1/routes/userProfile.json
index bbab40b..a228e34 100644
--- a/force-app/main/default/experiences/Consumable1/routes/userProfile.json
+++ b/force-app/main/default/experiences/Consumable1/routes/userProfile.json
@@ -1,9 +1,9 @@
 {
-  "activeViewId": "b3764d11-d26d-4554-8747-e7f30fb722bd",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "a611aa58-e18f-4242-882d-e91bc8977624",
-  "label": "User Profile",
-  "routeType": "detail-005",
-  "type": "route",
-  "urlPrefix": "profile"
+    "activeViewId": "b3764d11-d26d-4554-8747-e7f30fb722bd",
+    "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+    "id": "a611aa58-e18f-4242-882d-e91bc8977624",
+    "label": "User Profile",
+    "routeType": "detail-005",
+    "type": "route",
+    "urlPrefix": "profile"
 }

--
Gitblit v1.9.1