fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/experiences/Consumable_21/views/login.json

@@ -1,84 +1,84 @@
{
  "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "be3be526-74c7-4da5-a294-7c1b8c76c714",
  "label": "Login",
  "regions": [
    {
      "components": [
    "appPageId": "e8609e96-b5d8-40fb-a7e5-29203d1e7f60",
    "componentName": "siteforce:sldsOneColLayout",
    "dataProviders": [],
    "id": "be3be526-74c7-4da5-a294-7c1b8c76c714",
    "label": "Login",
    "regions": [
        {
          "componentAttributes": {},
          "componentName": "salesforceIdentity:communityLogo2",
          "id": "8840fb81-2fb9-4359-ad4d-57aedd5614e9",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
            "components": [
                {
                    "componentAttributes": {},
                    "componentName": "salesforceIdentity:communityLogo2",
                    "id": "8840fb81-2fb9-4359-ad4d-57aedd5614e9",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                },
                {
                    "componentAttributes": {
                        "forgotPasswordLabel": "忘记密码？",
                        "forgotPasswordUrl": "/ForgotPassword",
                        "loginButtonLabel": "登录",
                        "passwordLabel": "密码",
                        "selfRegisterLabel": "Not a member?",
                        "selfRegisterUrl": "/SelfRegister",
                        "startUrl": "",
                        "usernameLabel": "用户名"
                    },
                    "componentName": "salesforceIdentity:loginForm2",
                    "id": "8ead5baf-ed64-430c-a475-b6cdc3eb3b5c",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                },
                {
                    "componentAttributes": {
                        "headerText": "",
                        "showHeader": false,
                        "useCommunityDomainSso": true
                    },
                    "componentName": "salesforceIdentity:socialLogin2",
                    "id": "66f76f11-5317-435a-bfc6-3e59f8978cc6",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                },
                {
                    "componentAttributes": {
                        "employeeLoginLinkLabel": "Are you an employee? Login here"
                    },
                    "componentName": "salesforceIdentity:employeeLoginLink2",
                    "id": "e8e38ed8-1ddf-4a59-88ca-f270b0f0ebe0",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "51954b6d-bf9e-46f7-bd96-0e3d0cbdca43",
            "regionName": "content",
            "type": "region"
        },
        {
          "componentAttributes": {
            "forgotPasswordLabel": "忘记密码？",
            "forgotPasswordUrl": "/ForgotPassword",
            "loginButtonLabel": "登录",
            "passwordLabel": "密码",
            "selfRegisterLabel": "Not a member?",
            "selfRegisterUrl": "/SelfRegister",
            "startUrl": "",
            "usernameLabel": "用户名"
          },
          "componentName": "salesforceIdentity:loginForm2",
          "id": "8ead5baf-ed64-430c-a475-b6cdc3eb3b5c",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
          "componentAttributes": {
            "headerText": "",
            "showHeader": false,
            "useCommunityDomainSso": true
          },
          "componentName": "salesforceIdentity:socialLogin2",
          "id": "66f76f11-5317-435a-bfc6-3e59f8978cc6",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
          "componentAttributes": {
            "employeeLoginLinkLabel": "Are you an employee? Login here"
          },
          "componentName": "salesforceIdentity:employeeLoginLink2",
          "id": "e8e38ed8-1ddf-4a59-88ca-f270b0f0ebe0",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
            "components": [
                {
                    "componentAttributes": {
                        "customHeadTags": "",
                        "description": "",
                        "title": "Login"
                    },
                    "componentName": "forceCommunity:seoAssistant",
                    "id": "73410d9b-2aff-4d43-ad50-56db757ad791",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "93e7f8cf-1ccf-4fb8-9b1f-50e44e20ddcb",
            "regionName": "sfdcHiddenRegion",
            "type": "region"
        }
      ],
      "id": "51954b6d-bf9e-46f7-bd96-0e3d0cbdca43",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Login"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "73410d9b-2aff-4d43-ad50-56db757ad791",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "93e7f8cf-1ccf-4fb8-9b1f-50e44e20ddcb",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "login-home"
    ],
    "themeLayoutType": "Login",
    "type": "view",
    "viewType": "login-home"
}