X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/3d80a86b51c50ae4738a8414273c9bf250b9b248..946ae5c5685718148178cf51298f6f141eee9888:/windows/firefox.admx diff --git a/windows/firefox.admx b/windows/firefox.admx index 81a4d77..419a253 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -81,6 +81,8 @@ + + @@ -189,6 +191,13 @@ +<<<<<<< HEAD + +======= + +>>>>>>> master + + @@ -4580,7 +4589,7 @@ - + @@ -4623,5 +4632,116 @@ +<<<<<<< HEAD + + + +======= + + + +>>>>>>> master + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<<<<<<< HEAD + + + + + + + + + + + + + + + + + + + + +======= +>>>>>>> master