fix merge conflict

This commit is contained in:
Liz Long
2022-06-13 13:47:17 -04:00
1034 changed files with 8245 additions and 7495 deletions

View File

@ -5,12 +5,7 @@ manager: dougeby
ms.author: aaroncz
description: Learn about deploying Windows 10 with Microsoft 365 and how to use a free 90-day trial account to review some of the benefits of Microsoft 365.
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: deploy
keywords: deployment, automate, tools, configure, mdt, sccm, M365
ms.localizationpriority: medium
audience: itpro
author: aczechowski
ms.topic: article
ms.collection: M365-modern-desktop