From a25da1b5f34be860f6151177a313f627dd25b348 Mon Sep 17 00:00:00 2001 From: Diana Hanson Date: Wed, 25 May 2022 12:14:41 -0600 Subject: [PATCH] Update windows/client-management/mdm/policy-csp-controlpolicyconflict.md --- .../client-management/mdm/policy-csp-controlpolicyconflict.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md index 044fb7026f..522b144fb4 100644 --- a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md +++ b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md @@ -35,7 +35,7 @@ manager: dansimp > [!NOTE] > This setting doesn't apply to the following types of group policies: > -> - If they don't map to an MDM policy. For example, firewall policies and account lockout policies +> - If they don't map to an MDM policy. For example, firewall policies and account lockout policies. > - If they aren't defined by an ADMX. For example, Password policy - minimum password age. > - If they're in the Windows Update category. > - If they have list entries. For example, the Microsoft Edge CookiesAllowedForUrls policy.