resolved merge conflict

Author: Manika Dhiman

.openpublishing.publish.config.json

@@ -6,6 +6,7 @@
       "build_output_subfolder": "adaptive-cloud",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": false,
       "type_mapping": {
         "Conceptual": "Content"
@@ -29,14 +30,12 @@
       "template_folder": "_themes"
     },
     {
-      "docset_name": "AzureLocal",
-      "build_source_folder": "azure-local",
-      "build_output_subfolder": "AzureLocal",
+      "docset_name": "azure-managed-lustre",
+      "build_source_folder": "azure-managed-lustre",
+      "build_output_subfolder": "azure-managed-lustre",
       "locale": "en-us",
       "monikers": [],
-      "moniker_ranges": [
-        ">=azloc-2408"
-      ],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content"
@@ -45,12 +44,14 @@
       "template_folder": "_themes"
     },
     {
-      "docset_name": "azure-managed-lustre",
-      "build_source_folder": "azure-managed-lustre",
-      "build_output_subfolder": "azure-managed-lustre",
+      "docset_name": "AzureLocal",
+      "build_source_folder": "azure-local",
+      "build_output_subfolder": "AzureLocal",
       "locale": "en-us",
       "monikers": [],
-      "moniker_ranges": [],
+      "moniker_ranges": [
+        ">=azloc-2408"
+      ],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content"

.openpublishing.redirection.adaptive-cloud.json

@@ -0,0 +1,69 @@
+{
+  "redirections": [
+    {
+      "source_path": "adaptive-cloud/app-solutions/index.yml",
+      "redirect_url": "/azure-stack/user/overview-patterns-solution-examples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/overview-app-design-considerations.md",
+      "redirect_url": "/azure/architecture/guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/overview-patterns-solution-examples.md",
+      "redirect_url": "/azure-stack/user/overview-patterns-solution-examples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-cicd-pipeline.md",
+      "redirect_url": "/azure-stack/user/pattern-cicd-pipeline",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-cross-cloud-scale-onprem-data.md",
+      "redirect_url": "/azure-stack/user/pattern-cross-cloud-scale-on-premises-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-cross-cloud-scale.md",
+      "redirect_url": "/azure-stack/user/pattern-cross-cloud-scale",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-geo-distributed.md",
+      "redirect_url": "/azure-stack/user/pattern-geo-distributed",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-highly-available-kubernetes.md",
+      "redirect_url": "/azure-stack/user/pattern-highly-available-kubernetes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-hybrid-relay.md",
+      "redirect_url": "/azure-stack/user/pattern-hybrid-relay",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-out-of-stock-at-edge.md",
+      "redirect_url": "/azure-stack/user/pattern-out-of-stock-at-edge",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-retail-footfall-detection.md",
+      "redirect_url": "/azure-stack/user/pattern-retail-footfall-detection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-tiered-data-analytics.md",
+      "redirect_url": "/azure-stack/user/pattern-tiered-data-analytics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "adaptive-cloud/app-solutions/pattern-train-ml-model-at-edge.md",
+      "redirect_url": "/azure-stack/user/pattern-train-machine-learning-model-at-edge",
+      "redirect_document_id": false
+    }
+  ]
+}