pull master, fix conflicts

This commit is contained in:
Greg Lindsay
2020-02-18 13:14:22 -08:00
508 changed files with 7432 additions and 7974 deletions

View File

@ -10,7 +10,6 @@ ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.localizationpriority: medium
ms.date: 11/06/2018
audience: itpro
author: greg-lindsay
ms.topic: article
@ -37,13 +36,4 @@ Windows 10 upgrade options are discussed and information is provided about plann
## Related topics
[Modern Desktop Deployment Center](https://docs.microsoft.com/microsoft-365/enterprise/desktop-deployment-center-home)
 
 
[Modern Desktop Deployment Center](https://docs.microsoft.com/microsoft-365/enterprise/desktop-deployment-center-home)