X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/a6e14d33f338175b5a0228195b4614a0c4078233..946ae5c5685718148178cf51298f6f141eee9888:/windows/firefox.admx
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 92af0cc..419a253 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -81,7 +81,7 @@
-
+
@@ -191,6 +191,13 @@
+<<<<<<< HEAD
+
+=======
+
+>>>>>>> master
+
+
@@ -4625,5 +4632,116 @@
+<<<<<<< HEAD
+
+
+
+=======
+
+
+
+>>>>>>> master
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<<<<<<< HEAD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+>>>>>>> master