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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index b463070..e750ee0 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -288,8 +288,6 @@ If this policy is disabled or not configured, there are no exceptions to the web
       <string id="Bookmark34">Bookmark Thirty-four</string>
       <string id="Bookmark35">Bookmark Thirty-five</string>
       <string id="Bookmark36">Bookmark Thirty-six</string>
-<<<<<<< HEAD
-<<<<<<< HEAD
       <string id="Bookmark37">Bookmark Thirty-seven</string>
       <string id="Bookmark38">Bookmark Thirty-eight</string>
       <string id="Bookmark39">Bookmark Thirty-nine</string>
@@ -304,66 +302,6 @@ If this policy is disabled or not configured, there are no exceptions to the web
       <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>
-      <string id="Bookmark55">Bookmark Fifty-five</string>
-      <string id="Bookmark56">Bookmark Fifty-six</string>
-      <string id="Bookmark57">Bookmark Fifty-seven</string>
-      <string id="Bookmark58">Bookmark Fifty-eight</string>
-      <string id="Bookmark59">Bookmark Fifty-nine</string>
-      <string id="Bookmark60">Bookmark Sixty</string>
-      <string id="Bookmark61">Bookmark Sixty-one</string>
-      <string id="Bookmark62">Bookmark Sixty-two</string>
-      <string id="Bookmark63">Bookmark Sixty-three</string>
-      <string id="Bookmark64">Bookmark Sixty-four</string>
-      <string id="Bookmark65">Bookmark Sixty-five</string>
-      <string id="Bookmark66">Bookmark Sixty-six</string>
-      <string id="Bookmark67">Bookmark Sixty-seven</string>
-      <string id="Bookmark68">Bookmark Sixty-eight</string>
-      <string id="Bookmark69">Bookmark Sixty-nine</string>
-      <string id="Bookmark70">Bookmark Seventy</string>
-      <string id="Bookmark71">Bookmark Seventy-one</string>
-      <string id="Bookmark72">Bookmark Seventy-two</string>
-      <string id="Bookmark73">Bookmark Seventy-three</string>
-      <string id="Bookmark74">Bookmark Seventy-four</string>
-      <string id="Bookmark75">Bookmark Seventy-five</string>
-      <string id="Bookmark76">Bookmark Seventy-six</string>
-      <string id="Bookmark77">Bookmark Seventy-seven</string>
-      <string id="Bookmark78">Bookmark Seventy-eight</string>
-      <string id="Bookmark79">Bookmark Seventy-nine</string>
-      <string id="Bookmark80">Bookmark Eighty</string>
-      <string id="Bookmark81">Bookmark Eighty-one</string>
-      <string id="Bookmark82">Bookmark Eighty-two</string>
-      <string id="Bookmark83">Bookmark Eighty-three</string>
-      <string id="Bookmark84">Bookmark Eighty-four</string>
-      <string id="Bookmark85">Bookmark Eighty-five</string>
-      <string id="Bookmark86">Bookmark Eighty-six</string>
-      <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>