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/Site3/config/电子签收系统.json | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git "a/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
index a413c7a..c6de668 100644
--- "a/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
+++ "b/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
@@ -1,11 +1,11 @@
{
- "forgotPasswordRouteId": "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
- "isAvailableToGuests": true,
- "isFilteredComponentsView": false,
- "isProgressiveRenderingEnabled": false,
- "loginAppPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "mainAppPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "preferredDomain": "none",
- "selfRegistrationRouteId": "57c8022e-eb0c-43b6-97dc-a37a1d91b2ca",
- "type": "site"
+ "forgotPasswordRouteId": "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
+ "isAvailableToGuests": true,
+ "isFilteredComponentsView": false,
+ "isProgressiveRenderingEnabled": false,
+ "loginAppPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "mainAppPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "preferredDomain": "none",
+ "selfRegistrationRouteId": "57c8022e-eb0c-43b6-97dc-a37a1d91b2ca",
+ "type": "site"
}
--
Gitblit v1.9.1