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