Revert "Added even more bookmarks"

[policy-templates.git] / windows / en-US / firefox.adml

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 5cacddf3f75ee5268bcecaeaddc51564db716680..b46307034eaba4b6bde4c6d6b11b059826476b00 100644 (file)
--- 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.