From 275566cfe56c82a76691a1c54726870ba7a82ee3 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Wed, 15 Jun 2016 10:33:43 -0700 Subject: [PATCH] clear conflict --- .../implement-microsoft-passport-in-your-organization.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/windows/keep-secure/implement-microsoft-passport-in-your-organization.md b/windows/keep-secure/implement-microsoft-passport-in-your-organization.md index d201710b4a..4618fa1674 100644 --- a/windows/keep-secure/implement-microsoft-passport-in-your-organization.md +++ b/windows/keep-secure/implement-microsoft-passport-in-your-organization.md @@ -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** > **Administrative Templates** > **Windows Components** > **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** > **Policies** > **Administrative Templates** > **Windows Components** > **Windows Hello for Business**. ->>>>>>> refs/remotes/origin/rs1 +
Policy