Merged PR 12225: Fix errors

Somehow the entire doc got replaced. Fixing this, and some conflict errors
This commit is contained in:
Greg Lindsay
2018-10-19 16:59:44 +00:00
parent 567f866fd9
commit fc4eec6439
10 changed files with 268 additions and 54 deletions

View File

@ -9,13 +9,8 @@ ms.sitesec: library
ms.pagetype:
ms.localizationpriority: medium
author: greg-lindsay
<<<<<<< HEAD
ms.author: greg-lindsay
ms.date: 10/02/2018
=======
ms.author: greglin
ms.date: 06/01/2018
>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6
---
# Windows Autopilot Self-Deploying mode (Preview)