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

chore: Resolve merge conflict

Browse Source
This commit is contained in:
Nick Schonning
2018-10-26 13:44:43 -04:00
parent 2c232dafd0
commit 98cc8de68f
1 changed files with 0 additions and 4 deletions
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