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/Consumable_21/routes/register.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/routes/register.json b/force-app/main/default/experiences/Consumable_21/routes/register.json
index 6790da8..0ca6e74 100644
--- a/force-app/main/default/experiences/Consumable_21/routes/register.json
+++ b/force-app/main/default/experiences/Consumable_21/routes/register.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "293d892f-ceae-4d05-8c96-7ba490f34de8",
- "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
- "id": "dce32c5e-d7db-43df-89ed-04a41d3d695b",
- "label": "Register",
- "routeType": "self-register",
- "type": "route",
- "urlPrefix": "SelfRegister"
+ "activeViewId": "293d892f-ceae-4d05-8c96-7ba490f34de8",
+ "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
+ "id": "dce32c5e-d7db-43df-89ed-04a41d3d695b",
+ "label": "Register",
+ "routeType": "self-register",
+ "type": "route",
+ "urlPrefix": "SelfRegister"
}
--
Gitblit v1.9.1