fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

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

@@ -1,73 +1,73 @@
{
  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "d006b952-023c-4964-88f1-151e2b013a67",
  "label": "Topic Catalog",
  "regions": [
    {
      "components": [
    "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
    "componentName": "siteforce:sldsOneColLayout",
    "dataProviders": [],
    "id": "d006b952-023c-4964-88f1-151e2b013a67",
    "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": "694c1f11-7883-4699-94b0-17aae867fa13",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "05a42db9-02d2-43a4-80b8-45823466685e",
      "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": "694c1f11-7883-4699-94b0-17aae867fa13",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "05a42db9-02d2-43a4-80b8-45823466685e",
            "regionName": "header",
            "type": "region"
        },
        {
          "componentAttributes": {},
          "componentName": "forceCommunity:topicCatalog",
          "id": "3a9ffb91-cabf-45ae-9e71-7cf76584fff9",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "5fe00fbc-2281-469e-8c6e-2dd8468a1819",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "623b964f-9cd6-4513-982e-f6f196b3db38",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
            "components": [
                {
                    "componentAttributes": {},
                    "componentName": "forceCommunity:topicCatalog",
                    "id": "3a9ffb91-cabf-45ae-9e71-7cf76584fff9",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "5fe00fbc-2281-469e-8c6e-2dd8468a1819",
            "regionName": "content",
            "type": "region"
        },
        {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Topic Catalog"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "04697b2f-0118-4bcd-9940-9fd1bad9ef33",
          "renditionMap": {},
          "type": "component"
            "id": "623b964f-9cd6-4513-982e-f6f196b3db38",
            "regionName": "footer",
            "type": "region"
        },
        {
            "components": [
                {
                    "componentAttributes": {
                        "customHeadTags": "",
                        "description": "",
                        "title": "Topic Catalog"
                    },
                    "componentName": "forceCommunity:seoAssistant",
                    "id": "04697b2f-0118-4bcd-9940-9fd1bad9ef33",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "9e7ee946-0fc4-4c52-9fbd-0a9d04271b65",
            "regionName": "sfdcHiddenRegion",
            "type": "region"
        }
      ],
      "id": "9e7ee946-0fc4-4c52-9fbd-0a9d04271b65",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "topic-catalog"
    ],
    "themeLayoutType": "Inner",
    "type": "view",
    "viewType": "topic-catalog"
}