fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

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

@@ -1,93 +1,93 @@
{
  "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
  "componentName": "siteforce:sldsTwoCol84Layout",
  "dataProviders": [],
  "id": "b9923519-ef19-44ef-bd24-28ecae2ca1d0",
  "label": "Topic Detail",
  "regions": [
    {
      "components": [
    "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
    "componentName": "siteforce:sldsTwoCol84Layout",
    "dataProviders": [],
    "id": "b9923519-ef19-44ef-bd24-28ecae2ca1d0",
    "label": "Topic Detail",
    "regions": [
        {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:recordHeadline",
          "id": "60366746-9a8f-4431-a310-6cefc32cfacb",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "27f41546-f62e-4391-9687-1ef04fb4b429",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
            "components": [
                {
                    "componentAttributes": {
                        "recordId": "{!recordId}"
                    },
                    "componentName": "forceCommunity:recordHeadline",
                    "id": "60366746-9a8f-4431-a310-6cefc32cfacb",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "27f41546-f62e-4391-9687-1ef04fb4b429",
            "regionName": "header",
            "type": "region"
        },
        {
          "componentAttributes": {
            "canChangeSorting": false,
            "defaultFilter": "",
            "defaultSortOrderHomeFeed": "Relevance",
            "defaultSortOrderTopicsFeed": "Relevance",
            "feedDesign": "DEFAULT",
            "hasFeedSearch": false,
            "subjectId": "{!recordId}",
            "type": "Topics"
          },
          "componentName": "forceCommunity:forceCommunityFeed",
          "id": "c4bbca55-d58a-42e3-8db8-8425b0efbdaa",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "62d570bc-1a80-4f67-9ecf-76991f24a2b4",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
            "components": [
                {
                    "componentAttributes": {
                        "canChangeSorting": false,
                        "defaultFilter": "",
                        "defaultSortOrderHomeFeed": "Relevance",
                        "defaultSortOrderTopicsFeed": "Relevance",
                        "feedDesign": "DEFAULT",
                        "hasFeedSearch": false,
                        "subjectId": "{!recordId}",
                        "type": "Topics"
                    },
                    "componentName": "forceCommunity:forceCommunityFeed",
                    "id": "c4bbca55-d58a-42e3-8db8-8425b0efbdaa",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "62d570bc-1a80-4f67-9ecf-76991f24a2b4",
            "regionName": "content",
            "type": "region"
        },
        {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:recordDetail",
          "id": "be7c7d85-bb00-4992-9080-3c212ebd17ed",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "89d17053-a116-4fc4-bdfd-9b2fa68fe0e7",
      "regionName": "sidebar",
      "type": "region"
    },
    {
      "id": "aa44781d-51a2-4097-a64d-43b2d964a66c",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
            "components": [
                {
                    "componentAttributes": {
                        "recordId": "{!recordId}"
                    },
                    "componentName": "forceCommunity:recordDetail",
                    "id": "be7c7d85-bb00-4992-9080-3c212ebd17ed",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "89d17053-a116-4fc4-bdfd-9b2fa68fe0e7",
            "regionName": "sidebar",
            "type": "region"
        },
        {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "{!Record.Description}",
            "title": "{!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "edfe1dec-458c-471e-9b8d-3b2d1d16f24d",
          "renditionMap": {},
          "type": "component"
            "id": "aa44781d-51a2-4097-a64d-43b2d964a66c",
            "regionName": "footer",
            "type": "region"
        },
        {
            "components": [
                {
                    "componentAttributes": {
                        "customHeadTags": "",
                        "description": "{!Record.Description}",
                        "title": "{!Record._Title}"
                    },
                    "componentName": "forceCommunity:seoAssistant",
                    "id": "edfe1dec-458c-471e-9b8d-3b2d1d16f24d",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "c89d726d-95b1-49b4-86e6-cd374e3ca09d",
            "regionName": "sfdcHiddenRegion",
            "type": "region"
        }
      ],
      "id": "c89d726d-95b1-49b4-86e6-cd374e3ca09d",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "topic"
    ],
    "themeLayoutType": "Inner",
    "type": "view",
    "viewType": "topic"
}