Fix initial merge conflict

Author: gitName

.openpublishing.redirection.json

@@ -51421,6 +51421,86 @@
       "source_path": "learn-pr/paths/evolve-your-devops-practices/index.yml",
       "redirect_url": "https://learn.microsoft.com/azure/devops/get-started/?view=azure-devops",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/index.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/6-configure-search-permissions-filters.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/3-create-content-search.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/2-explore-ediscovery-solutions.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/5-export-search-results.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/1-introduction.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/8-knowledge-check.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/7-search-delete-email-messages.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/9-summary.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/4-view-search-results.md",
+      "redirect_url": "/training/modules/purview-ediscovery-search/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/create-implement-application-allowlists-adaptive-application-control/index.md",
+      "redirect_url": "/training/paths/implement-windows-server-iaas-virtual-machine-security/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/create-implement-application-allowlists-adaptive-application-control/2-describe-controls.md",
+      "redirect_url": "/training/paths/implement-windows-server-iaas-virtual-machine-security/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/create-implement-application-allowlists-adaptive-application-control/3-implement-policy.md",
+      "redirect_url": "/training/paths/implement-windows-server-iaas-virtual-machine-security/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/create-implement-application-allowlists-adaptive-application-control/1-introduction.md",
+      "redirect_url": "/training/paths/implement-windows-server-iaas-virtual-machine-security/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/create-implement-application-allowlists-adaptive-application-control/4-knowledge-check.md",
+      "redirect_url": "/training/paths/implement-windows-server-iaas-virtual-machine-security/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/create-implement-application-allowlists-adaptive-application-control/5-summary.md",
+      "redirect_url": "/training/paths/implement-windows-server-iaas-virtual-machine-security/",
+      "redirect_document_id": false
     }
   ]
 }

learn-pr/achievements.yml

@@ -6120,3 +6120,8 @@ achievements:
   title: Get started with Azure DevOps
   summary: DevOps is the union of people, process, and products to enable continuous delivery of value to your end users. Azure DevOps is a set of services that gives you the tools you need to do just that. With Azure DevOps, you can build, test, and deploy any application, either to the cloud or on premises. DevOps practices that enable transparency, cooperation, continuous delivery and continuous deployment become embedded in your software development lifecycle.
   iconUrl: /training/achievements/azure-devops/evolve-your-devops-practices.svg
+- uid: learn.wwl.create-implement-application-allowlists-with-adaptive-application-control.badge
+  type: badge
+  title: Create and implement application allowlists with adaptive application control
+  summary: You're able to implement Adaptive application controls within your organization to protect your Windows Server IaaS VMs.
+  iconUrl: /training/achievements/create-and-implement-application-allowlists-with-adaptive-application-control.svg