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/register.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/register.json b/force-app/main/default/experiences/Consumable1/routes/register.json
index f0f976a..1528f81 100644
--- a/force-app/main/default/experiences/Consumable1/routes/register.json
+++ b/force-app/main/default/experiences/Consumable1/routes/register.json
@@ -1,9 +1,9 @@
{
- "activeViewId": "3af8afbb-87fe-417d-818c-7e8a8f00faf6",
- "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
- "id": "e8838dbc-c64c-4cd5-b34a-9dea25b08d42",
- "label": "Register",
- "routeType": "self-register",
- "type": "route",
- "urlPrefix": "SelfRegister"
+ "activeViewId": "7cadb098-b80c-40d4-a33c-714c36f8a2f3",
+ "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+ "id": "2d8061dd-a482-4608-8514-113389805fc4",
+ "label": "Register",
+ "routeType": "self-register",
+ "type": "route",
+ "urlPrefix": "SelfRegister"
}
--
Gitblit v1.9.1