X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/3e304d0c7b7dcbe12c735ea4d567533457e211d8..95d70cbdf19c77f6513fb80d88bbf6afc8553075:/windows/en-US/firefox.adml

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 5cacddf..b463070 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -288,6 +288,7 @@ 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>
@@ -343,6 +344,8 @@ If this policy is disabled or not configured, there are no exceptions to the web
       <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>
@@ -357,6 +360,9 @@ 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>
+<<<<<<< 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.