resolve the conflict

This commit is contained in:
huaping yu
2019-09-06 14:50:57 -07:00
52 changed files with 473 additions and 511 deletions

View File

@ -4,9 +4,9 @@ description: Windows 10 client management
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerms
author: dansimp
ms.localizationpriority: medium
ms.date: 08/16/2017
ms.author: dansimp
---
# Client management