fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/experiences/Consumable_21/config/consumableϵͳ2.json

@@ -1,11 +1,11 @@
{
  "forgotPasswordRouteId": "4cfab14e-4605-4e93-b8d1-cbaec0413e1a",
  "isAvailableToGuests": false,
  "isFilteredComponentsView": false,
  "isProgressiveRenderingEnabled": false,
  "loginAppPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
  "mainAppPageId": "928a593f-f341-403e-8346-df32afe29b52",
  "preferredDomain": "none",
  "selfRegistrationRouteId": "dce32c5e-d7db-43df-89ed-04a41d3d695b",
  "type": "site"
    "forgotPasswordRouteId": "4cfab14e-4605-4e93-b8d1-cbaec0413e1a",
    "isAvailableToGuests": false,
    "isFilteredComponentsView": false,
    "isProgressiveRenderingEnabled": false,
    "loginAppPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
    "mainAppPageId": "928a593f-f341-403e-8346-df32afe29b52",
    "preferredDomain": "none",
    "selfRegistrationRouteId": "dce32c5e-d7db-43df-89ed-04a41d3d695b",
    "type": "site"
}