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

clear conflict

Browse Source
This commit is contained in:
jdeckerMS
2016-06-15 10:33:43 -07:00
parent ec8d30cb42
commit 275566cfe5
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,13 +21,9 @@ You can create a Group Policy or mobile device management (MDM) policy that will
 
## Group Policy settings for Passport
<<<<<<< HEAD
The following table lists the Group Policy settings that you can configure for Passport use in your workplace. *These policy settings are available in both **User configuration** and **Computer Configuration** under **Policies** &gt; **Administrative Templates** &gt; **Windows Components** &gt; **Windows Hello for Business**.*
=======
The following table lists the Group Policy settings that you can configure for Hello use in your workplace. These policy settings are available in **Computer Configuration** &gt; **Policies** &gt; **Administrative Templates** &gt; **Windows Components** &gt; **Windows Hello for Business**.
>>>>>>> refs/remotes/origin/rs1
<table>
<tr>
<th colspan="2">Policy</th>