Merge pull request #8464 from saurabhkoshta/patch-1

Update policy-csp-controlpolicyconflict.md
This commit is contained in:
Manika Dhiman 2020-10-19 10:42:36 -07:00 committed by GitHub
commit d5b3b6a038
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -79,6 +79,9 @@ Added in Windows 10, version 1803. This policy allows the IT admin to control wh
> [!NOTE]
> MDMWinsOverGP only applies to policies in Policy CSP. It does not apply to other MDM settings with equivalent GP settings that are defined on other configuration service providers.
> [!NOTE]
> This policy setting is *not* applicable to co-managed Windows devices.
This policy is used to ensure that MDM policy wins over GP when policy is configured on MDM channel. The default value is 0. The MDM policies in Policy CSP will behave as described if this policy value is set 1.
Note: This policy doesnt support the Delete command and doesnt support setting the value to 0 again after it was previously set to 1. Windows 10 version 1809 will support using the Delete command to set the value to 0 again, if it was previously set to 1.