deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-15 10:23:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merged PR 12225: Fix errors

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
windows/deployment/windows-autopilot/user-driven-aad.md
View File

@ -16,8 +16,4 @@ ms.date: 10/02/2018
**Applies to: Windows 10**
<<<<<<< HEAD
PLACEHOLDER. This topic is a placeholder for the AAD-specific instuctions currently in user-driven.md.
=======
Placeholder. Content coming.
>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6