fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

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

@@ -1,73 +1,73 @@
{
  "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "beef814b-071b-4cc4-b306-273e36bcd4e1",
  "label": "Topic Catalog",
  "regions": [
    {
      "components": [
    "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
    "componentName": "siteforce:sldsOneColLayout",
    "dataProviders": [],
    "id": "beef814b-071b-4cc4-b306-273e36bcd4e1",
    "label": "Topic Catalog",
    "regions": [
        {
          "componentAttributes": {
            "bannerText": "",
            "bannerTextWithKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
            "bannerTextWithoutKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
            "pageType": "",
            "showSubTopics": true,
            "title": "Topics",
            "uniqueNameOrId": ""
          },
          "componentName": "forceCommunity:headline",
          "id": "2a44ee73-57c5-42ef-8001-90f21054b7d9",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "9114b0eb-f41b-446c-8e81-ae276fbf3f9f",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
            "components": [
                {
                    "componentAttributes": {
                        "bannerText": "",
                        "bannerTextWithKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
                        "bannerTextWithoutKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
                        "pageType": "",
                        "showSubTopics": true,
                        "title": "Topics",
                        "uniqueNameOrId": ""
                    },
                    "componentName": "forceCommunity:headline",
                    "id": "2a44ee73-57c5-42ef-8001-90f21054b7d9",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "9114b0eb-f41b-446c-8e81-ae276fbf3f9f",
            "regionName": "header",
            "type": "region"
        },
        {
          "componentAttributes": {},
          "componentName": "forceCommunity:topicCatalog",
          "id": "cc2cb5e4-126f-4489-8fce-4bd5a04ff383",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "5e5f78d5-b0aa-4dd8-8bf2-32b440a067a3",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "23f9bcb5-de3e-4c2d-a041-a0a604ed4c07",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
            "components": [
                {
                    "componentAttributes": {},
                    "componentName": "forceCommunity:topicCatalog",
                    "id": "cc2cb5e4-126f-4489-8fce-4bd5a04ff383",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "5e5f78d5-b0aa-4dd8-8bf2-32b440a067a3",
            "regionName": "content",
            "type": "region"
        },
        {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Topic Catalog"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "27892553-0439-44fd-9450-4a9ff77715ed",
          "renditionMap": {},
          "type": "component"
            "id": "23f9bcb5-de3e-4c2d-a041-a0a604ed4c07",
            "regionName": "footer",
            "type": "region"
        },
        {
            "components": [
                {
                    "componentAttributes": {
                        "customHeadTags": "",
                        "description": "",
                        "title": "Topic Catalog"
                    },
                    "componentName": "forceCommunity:seoAssistant",
                    "id": "27892553-0439-44fd-9450-4a9ff77715ed",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "aae63a44-aa78-4738-bd23-f6bbf32434e6",
            "regionName": "sfdcHiddenRegion",
            "type": "region"
        }
      ],
      "id": "aae63a44-aa78-4738-bd23-f6bbf32434e6",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "topic-catalog"
    ],
    "themeLayoutType": "Inner",
    "type": "view",
    "viewType": "topic-catalog"
}