deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-12 13:27:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update windows/client-management/mdm/policy-csp-controlpolicyconflict.md

Browse Source
This commit is contained in:
Diana Hanson 2022-05-25 12:14:41 -06:00 committed by GitHub
parent 193ab8d200
commit a25da1b5f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
windows/client-management/mdm/policy-csp-controlpolicyconflict.md
View File

@ -35,7 +35,7 @@ manager: dansimp
> [!NOTE] > [!NOTE]
> This setting doesn't apply to the following types of group policies: > 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 aren't defined by an ADMX. For example, Password policy - minimum password age.
> - If they're in the Windows Update category. > - If they're in the Windows Update category.
> - If they have list entries. For example, the Microsoft Edge CookiesAllowedForUrls policy. > - If they have list entries. For example, the Microsoft Edge CookiesAllowedForUrls policy.