X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/946ae5c5685718148178cf51298f6f141eee9888..7b1b270a100065e83df08cc5160cd3084cd009a5:/windows/firefox.admx

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 419a253..aa79cc8 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -191,11 +191,8 @@
     <category displayName="$(string.InterceptionPoints_DragAndDrop_group)" name="InterceptionPoints_DragAndDrop">
       <parentCategory ref="InterceptionPoints"/>
     </category>
-<<<<<<< HEAD
-    <category displayName="$(string.GenerativeAI_group)" name="GenerativeAI">
-=======
     <category displayName="$(string.FirefoxHome_group)" name="FirefoxHome">
->>>>>>> master
+    <category displayName="$(string.GenerativeAI_group)" name="GenerativeAI">
       <parentCategory ref="firefox"/>
     </category>
   </categories>
@@ -4632,15 +4629,9 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-<<<<<<< HEAD
-    <policy name="GenerativeAI_Chatbot" class="Both" displayName="$(string.GenerativeAI_Chatbot)" explainText="$(string.GenerativeAI_Chatbot_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="Chatbot">
-      <parentCategory ref="GenerativeAI"/>
-      <supportedOn ref="SUPPORTED_FF144"/>
-=======
     <policy name="FirefoxHome_Search" class="Both" displayName="$(string.FirefoxHome_Search)" explainText="$(string.FirefoxHome_Search_Explain)" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="Search">
       <parentCategory ref="FirefoxHome"/>
       <supportedOn ref="SUPPORTED_FF68"/>
->>>>>>> master
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -4648,8 +4639,6 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="GenerativeAI_LinkPreviews" class="Both" displayName="$(string.GenerativeAI_LinkPreviews)" explainText="$(string.GenerativeAI_LinkPreviews_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="LinkPreviews">
-      <parentCategory ref="GenerativeAI"/>
     <policy name="FirefoxHome_TopSites" class="Both" displayName="$(string.FirefoxHome_TopSites)" explainText="$(string.FirefoxHome_TopSites_Explain)" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="TopSites">
       <parentCategory ref="FirefoxHome"/>
       <supportedOn ref="SUPPORTED_FF68"/>
@@ -4720,7 +4709,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-<<<<<<< HEAD
+    <policy name="GenerativeAI_Chatbot" class="Both" displayName="$(string.GenerativeAI_Chatbot)" explainText="$(string.GenerativeAI_Chatbot_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="Chatbot">
+      <parentCategory ref="GenerativeAI"/>
+      <supportedOn ref="SUPPORTED_FF144"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="GenerativeAI_LinkPreviews" class="Both" displayName="$(string.GenerativeAI_LinkPreviews)" explainText="$(string.GenerativeAI_LinkPreviews_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="LinkPreviews">
+      <parentCategory ref="GenerativeAI"/>
+      <supportedOn ref="SUPPORTED_FF144_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="GenerativeAI_TabGroups" class="Both" displayName="$(string.GenerativeAI_TabGroups)" explainText="$(string.GenerativeAI_TabGroups_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="TabGroups">
       <parentCategory ref="GenerativeAI"/>
       <supportedOn ref="SUPPORTED_FF144_ONLY"/>
@@ -4741,7 +4749,5 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-=======
->>>>>>> master
   </policies>
 </policyDefinitions>