fix merge conflicts

2025-06-23 22:33:41 +00:00 · 2022-12-09 08:37:17 -05:00
parent 1ec4edb54e a30f5e82cb
commit 5e52b6e7ea
631 changed files with 33 additions and 671 deletions
--- a/windows/deployment/do/delivery-optimization-proxy.md
+++ b/windows/deployment/do/delivery-optimization-proxy.md
@ -6,7 +6,6 @@ ms.prod: windows-client
 author: carmenf
 ms.localizationpriority: medium
 ms.author: carmenf
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.technology: itpro-updates
 ms.date: 12/31/2017
--- a/windows/deployment/do/delivery-optimization-workflow.md
+++ b/windows/deployment/do/delivery-optimization-workflow.md
@ -6,7 +6,6 @@ ms.prod: windows-client
 author: carmenf
 ms.localizationpriority: medium
 ms.author: carmenf
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.technology: itpro-updates
 ms.date: 12/31/2017
--- a/windows/deployment/do/images/elixir_ux/readme-elixir-ux-files.md
+++ b/windows/deployment/do/images/elixir_ux/readme-elixir-ux-files.md
@ -9,7 +9,6 @@ audience: itpro
 author: nidos
 ms.localizationpriority: medium
 ms.author: nidos
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-enterprise-appendix.md
+++ b/windows/deployment/do/mcc-enterprise-appendix.md
@ -6,7 +6,6 @@ ms.prod: windows-client
 author: amymzhou
 ms.author: amyzhou
 ms.localizationpriority: medium
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-enterprise-deploy.md
+++ b/windows/deployment/do/mcc-enterprise-deploy.md
@ -6,7 +6,6 @@ ms.prod: windows-client
 author: amymzhou
 ms.localizationpriority: medium
 ms.author: amyzhou
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-enterprise-prerequisites.md
+++ b/windows/deployment/do/mcc-enterprise-prerequisites.md
@ -6,7 +6,6 @@ ms.prod: windows-client
 author: amymzhou
 ms.localizationpriority: medium
 ms.author: amyzhou
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-enterprise-update-uninstall.md
+++ b/windows/deployment/do/mcc-enterprise-update-uninstall.md
@ -6,7 +6,6 @@ ms.prod: windows-client
 author: amymzhou
 ms.localizationpriority: medium
 ms.author: amyzhou
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-isp-cache-node-configuration.md
+++ b/windows/deployment/do/mcc-isp-cache-node-configuration.md
@ -9,7 +9,6 @@ audience: itpro
 author: amyzhou
 ms.localizationpriority: medium
 ms.author: amyzhou
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-isp-create-provision-deploy.md
+++ b/windows/deployment/do/mcc-isp-create-provision-deploy.md
@ -9,7 +9,6 @@ audience: itpro
 author: nidos
 ms.localizationpriority: medium
 ms.author: nidos
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-isp-signup.md
+++ b/windows/deployment/do/mcc-isp-signup.md
@ -9,7 +9,6 @@ audience: itpro
 author: nidos
 ms.localizationpriority: medium
 ms.author: nidos
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-isp-support.md
+++ b/windows/deployment/do/mcc-isp-support.md
@ -8,7 +8,6 @@ audience: itpro
 author: nidos
 ms.localizationpriority: medium
 ms.author: nidos
-ms.collection: M365-modern-desktop
 ms.topic: reference
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-isp-update.md
+++ b/windows/deployment/do/mcc-isp-update.md
@ -9,7 +9,6 @@ audience: itpro
 author: amyzhou
 ms.localizationpriority: medium
 ms.author: amyzhou
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-isp-verify-cache-node.md
+++ b/windows/deployment/do/mcc-isp-verify-cache-node.md
@ -9,7 +9,6 @@ audience: itpro
 author: amyzhou
 ms.localizationpriority: medium
 ms.author: amyzhou
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-isp-vm-performance.md
+++ b/windows/deployment/do/mcc-isp-vm-performance.md
@ -9,7 +9,6 @@ audience: itpro
 author: amyzhou
 ms.localizationpriority: medium
 ms.author: amyzhou
-ms.collection: M365-modern-desktop
 ms.topic: reference
 ms.date: 12/31/2017
 ---
--- a/windows/deployment/do/mcc-isp.md
+++ b/windows/deployment/do/mcc-isp.md
@ -8,7 +8,6 @@ author: amymzhou
 ms.author: amyzhou
 ms.reviewer: carmenf
 manager: aaroncz
-ms.collection: M365-modern-desktop
 ms.topic: how-to
 ms.date: 05/20/2022
 ---
--- a/windows/deployment/do/waas-delivery-optimization-reference.md
+++ b/windows/deployment/do/waas-delivery-optimization-reference.md
@ -7,7 +7,6 @@ ms.prod: windows-client
 author: carmenf
 ms.localizationpriority: medium
 ms.author: carmenf
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.custom: seo-marvel-apr2020
 ms.technology: itpro-updates
--- a/windows/deployment/do/waas-delivery-optimization-setup.md
+++ b/windows/deployment/do/waas-delivery-optimization-setup.md
@ -7,7 +7,6 @@ ms.prod: windows-client
 author: carmenf
 ms.localizationpriority: medium
 ms.author: carmenf
-ms.collection: M365-modern-desktop
 ms.topic: article
 ms.custom: seo-marvel-apr2020
 ms.technology: itpro-updates
--- a/windows/deployment/do/waas-delivery-optimization.md
+++ b/windows/deployment/do/waas-delivery-optimization.md
@ -7,8 +7,6 @@ author: carmenf
 ms.localizationpriority: medium
 ms.author: carmenf
 ms.collection: 
-  - M365-modern-desktop
-  - m365initiative-coredeploy
  - highpri
 ms.topic: article
 ms.custom: seo-marvel-apr2020
--- a/windows/deployment/do/waas-microsoft-connected-cache.md
+++ b/windows/deployment/do/waas-microsoft-connected-cache.md
@ -6,9 +6,6 @@ ms.prod: windows-client
 author: carmenf
 ms.localizationpriority: medium
 ms.author: carmenf
-ms.collection: 
-  - M365-modern-desktop
-  - m365initiative-coredeploy
 ms.topic: article
 ms.custom: seo-marvel-apr2020
 ms.technology: itpro-updates
--- a/windows/deployment/do/whats-new-do.md
+++ b/windows/deployment/do/whats-new-do.md
@ -6,9 +6,6 @@ ms.prod: windows-client
 author: carmenf
 ms.localizationpriority: medium
 ms.author: carmenf
-ms.collection: 
-  - M365-modern-desktop
-  - m365initiative-coredeploy
 ms.topic: article
 ms.custom: seo-marvel-apr2020
 ms.technology: itpro-updates