From bcf34f4ca4908f35aa601e6cf09e6bd5aa827059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B0=E5=AE=85=20=E4=BC=B8=E5=95=93?= Date: Fri, 30 Mar 2018 00:28:28 +0900 Subject: [PATCH] Fix Conflict and Fix Table Layout What's new in Windows 10, version 1803 --- .../mdm/new-in-windows-mdm-enrollment-management.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index a7eeb7a2b0..b0f80a167b 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -1329,16 +1329,20 @@ For details about Microsoft mobile device management protocols for Windows 10 s -<<<<<<< HEAD + + + [AccountManagement CSP](accountmanagement-csp.md)

Added a new CSP in Windows 10, version 1803.

-======= + + + [RootCATrustedCertificates CSP](rootcacertificates-csp.md)

Added the following node in Windows 10, version 1803:

->>>>>>> 2aa0839b99c52229c7cf43d58f467019b1284a6a +