deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-12 21:37:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1958 from nschonni/merge-conflict-apply

Browse Source 
chore: Resolve merge conflict
This commit is contained in:
Patti Short 2018-10-26 10:46:50 -07:00 committed by GitHub
commit 7db788f8a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,4 @@ ms.date: 10/02/2018
**Applies to: Windows 10** **Applies to: Windows 10**
<<<<<<< HEAD
PLACEHOLDER. This topic is a placeholder for the AD-specific (hybrid) instuctions. PLACEHOLDER. This topic is a placeholder for the AD-specific (hybrid) instuctions.
=======
Placeholder. Content coming.
>>>>>>> 01422d156afc7ab2286b8769aee1c4c39351a5f6