X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/8c70d638b0bfb44cf942e2778f0797750e2d38f6..95d70cbdf19c77f6513fb80d88bbf6afc8553075:/windows/en-US/firefox.adml?ds=inline

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index bb2bb75..b463070 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -257,52 +257,54 @@ If this policy is disabled or not configured, there are no exceptions to the web
       <string id="Bookmark03">Bookmark Three</string>
       <string id="Bookmark04">Bookmark Four</string>
       <string id="Bookmark05">Bookmark Five</string>
-	<string id="Bookmark06">Bookmark Six</string>
-	<string id="Bookmark07">Bookmark Seven</string>
-	<string id="Bookmark08">Bookmark Eight</string>
-	<string id="Bookmark09">Bookmark Nine</string>
-	<string id="Bookmark10">Bookmark Ten</string>
-	<string id="Bookmark11">Bookmark Eleven</string>
-	<string id="Bookmark12">Bookmark Twelve</string>
-	<string id="Bookmark13">Bookmark Thirteen</string>
-	<string id="Bookmark14">Bookmark Fourteen</string>
-	<string id="Bookmark15">Bookmark Fifteen</string>
-	<string id="Bookmark16">Bookmark Sixteen</string>
-	<string id="Bookmark17">Bookmark Seventeen</string>
-	<string id="Bookmark18">Bookmark Eighteen</string>
-	<string id="Bookmark19">Bookmark Nineteen</string>
-	<string id="Bookmark20">Bookmark Twenty</string>
-	<string id="Bookmark21">Bookmark Twenty-one</string>
-	<string id="Bookmark22">Bookmark Twenty-two</string>
-	<string id="Bookmark23">Bookmark Twenty-three</string>
-	<string id="Bookmark24">Bookmark Twenty-four</string>
-	<string id="Bookmark25">Bookmark Twenty-five</string>
-	<string id="Bookmark26">Bookmark Twenty-six</string>
-	<string id="Bookmark27">Bookmark Twenty-seven</string>
-	<string id="Bookmark28">Bookmark Twenty-eight</string>
-	<string id="Bookmark29">Bookmark Twenty-nine</string>
-	<string id="Bookmark30">Bookmark Thirty</string>
-	<string id="Bookmark31">Bookmark Thirty-one</string>
-	<string id="Bookmark32">Bookmark Thirty-two</string>
-	<string id="Bookmark33">Bookmark Thirty-three</string>
-	<string id="Bookmark34">Bookmark Thirty-four</string>
-	<string id="Bookmark35">Bookmark Thirty-five</string>
+      <string id="Bookmark06">Bookmark Six</string>
+      <string id="Bookmark07">Bookmark Seven</string>
+      <string id="Bookmark08">Bookmark Eight</string>
+      <string id="Bookmark09">Bookmark Nine</string>
+      <string id="Bookmark10">Bookmark Ten</string>
+      <string id="Bookmark11">Bookmark Eleven</string>
+      <string id="Bookmark12">Bookmark Twelve</string>
+      <string id="Bookmark13">Bookmark Thirteen</string>
+      <string id="Bookmark14">Bookmark Fourteen</string>
+      <string id="Bookmark15">Bookmark Fifteen</string>
+      <string id="Bookmark16">Bookmark Sixteen</string>
+      <string id="Bookmark17">Bookmark Seventeen</string>
+      <string id="Bookmark18">Bookmark Eighteen</string>
+      <string id="Bookmark19">Bookmark Nineteen</string>
+      <string id="Bookmark20">Bookmark Twenty</string>
+      <string id="Bookmark21">Bookmark Twenty-one</string>
+      <string id="Bookmark22">Bookmark Twenty-two</string>
+      <string id="Bookmark23">Bookmark Twenty-three</string>
+      <string id="Bookmark24">Bookmark Twenty-four</string>
+      <string id="Bookmark25">Bookmark Twenty-five</string>
+      <string id="Bookmark26">Bookmark Twenty-six</string>
+      <string id="Bookmark27">Bookmark Twenty-seven</string>
+      <string id="Bookmark28">Bookmark Twenty-eight</string>
+      <string id="Bookmark29">Bookmark Twenty-nine</string>
+      <string id="Bookmark30">Bookmark Thirty</string>
+      <string id="Bookmark31">Bookmark Thirty-one</string>
+      <string id="Bookmark32">Bookmark Thirty-two</string>
+      <string id="Bookmark33">Bookmark Thirty-three</string>
+      <string id="Bookmark34">Bookmark Thirty-four</string>
+      <string id="Bookmark35">Bookmark Thirty-five</string>
       <string id="Bookmark36">Bookmark Thirty-six</string>
-	<string id="Bookmark37">Bookmark Thirty-seven</string>
-	<string id="Bookmark38">Bookmark Thirty-eight</string>
-	<string id="Bookmark39">Bookmark Thirty-nine</string>
-	<string id="Bookmark40">Bookmark Forty</string>
-	<string id="Bookmark41">Bookmark Forty-one</string>
-	<string id="Bookmark42">Bookmark Forty-two</string>
-	<string id="Bookmark43">Bookmark Forty-three</string>
-	<string id="Bookmark44">Bookmark Forty-four</string>
-	<string id="Bookmark45">Bookmark Forty-five</string>
-	<string id="Bookmark46">Bookmark Forty-six</string>
-	<string id="Bookmark47">Bookmark Forty-seven</string>
-	<string id="Bookmark48">Bookmark Forty-eight</string>
-	<string id="Bookmark49">Bookmark Forty-nine</string>
-	<string id="Bookmark50">Bookmark Fifty</string>
-	<string id="Bookmark51">Bookmark Fifty-one</string>
+<<<<<<< HEAD
+<<<<<<< HEAD
+      <string id="Bookmark37">Bookmark Thirty-seven</string>
+      <string id="Bookmark38">Bookmark Thirty-eight</string>
+      <string id="Bookmark39">Bookmark Thirty-nine</string>
+      <string id="Bookmark40">Bookmark Forty</string>
+      <string id="Bookmark41">Bookmark Forty-one</string>
+      <string id="Bookmark42">Bookmark Forty-two</string>
+      <string id="Bookmark43">Bookmark Forty-three</string>
+      <string id="Bookmark44">Bookmark Forty-four</string>
+      <string id="Bookmark45">Bookmark Forty-five</string>
+      <string id="Bookmark46">Bookmark Forty-six</string>
+      <string id="Bookmark47">Bookmark Forty-seven</string>
+      <string id="Bookmark48">Bookmark Forty-eight</string>
+      <string id="Bookmark49">Bookmark Forty-nine</string>
+      <string id="Bookmark50">Bookmark Fifty</string>
+      <string id="Bookmark51">Bookmark Fifty-one</string>
       <string id="Bookmark52">Bookmark Fifty-two</string>
       <string id="Bookmark53">Bookmark Fifty-three</string>
       <string id="Bookmark54">Bookmark Fifty-four</string>
@@ -341,6 +343,27 @@ If this policy is disabled or not configured, there are no exceptions to the web
       <string id="Bookmark87">Bookmark Eighty-seven</string>
       <string id="Bookmark88">Bookmark Eighty-eight</string>
       <string id="Bookmark89">Bookmark Eighty-nine</string>
+=======
+=======
+>>>>>>> parent of 8c70d63... Added even more bookmarks
+	<string id="Bookmark37">Bookmark Thirty-seven</string>
+	<string id="Bookmark38">Bookmark Thirty-eight</string>
+	<string id="Bookmark39">Bookmark Thirty-nine</string>
+	<string id="Bookmark40">Bookmark Forty</string>
+	<string id="Bookmark41">Bookmark Forty-one</string>
+	<string id="Bookmark42">Bookmark Forty-two</string>
+	<string id="Bookmark43">Bookmark Forty-three</string>
+	<string id="Bookmark44">Bookmark Forty-four</string>
+	<string id="Bookmark45">Bookmark Forty-five</string>
+	<string id="Bookmark46">Bookmark Forty-six</string>
+	<string id="Bookmark47">Bookmark Forty-seven</string>
+	<string id="Bookmark48">Bookmark Forty-eight</string>
+	<string id="Bookmark49">Bookmark Forty-nine</string>
+	<string id="Bookmark50">Bookmark Fifty</string>
+<<<<<<< HEAD
+>>>>>>> parent of 8c70d63... Added even more bookmarks
+=======
+>>>>>>> parent of 8c70d63... Added even more bookmarks
       <string id="Bookmark_Explain">If this policy is enabled, you can configure a bookmark be added to Firefox.  Due to a bug, you must select the location. Note that you must specify the bookmarks in order.
 
 If this policy is not configured or disabled, a new bookmark is not added.</string>