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

Merge remote-tracking branch 'refs/remotes/origin/master' into live

Browse Source
This commit is contained in:
LizRoss
2016-08-23 09:56:15 -07:00
parent cd3150add7 e24936899b
commit 07b3fcc9ea
8 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
windows/keep-secure/implement-microsoft-passport-in-your-organization.md
View File

@ -342,7 +342,6 @@ You’ll need this software to set Windows Hello for Business policies in your e
<li>Azure AD subscription</li>
<li>[Azure AD Connect](http://go.microsoft.com/fwlink/p/?LinkId=616792)</li>
<li>AD CS with NDES</li>
<<<<<<< HEAD
<li>Configuration Manager for domain-joined certificate enrollment, or InTune for non-domain-joined devices, or a non-Microsoft MDM service that supports Passport for Work</li>
</ul></td>
</tr>