Mozilla Firefox

Merge lp:~willcooke/firefox/bookmarks-update into lp:firefox

  1. bookmarks-update
  2. Merge into firefox-trunk.head
Proposed by Will Cooke on 2016-02-19
Status: Merged
Merged at revision: 2038
Proposed branch: lp:~willcooke/firefox/bookmarks-update
Merge into: lp:firefox
Diff against target: 11 lines (+0/-1)
1 file modified
debian/patches/ubuntu-bookmarks.patch (+0/-1)
To merge this branch: bzr merge lp:~willcooke/firefox/bookmarks-update
Reviewer Review Type Date Requested Status
Chris Coulson 2016-02-19 Pending
Review via email: mp+286633@code.launchpad.net

Commit Message

Removed U1 from Ubuntu bookmarks patch

Description of the Change

Removed U1 from Ubuntu bookmarks patch

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/ubuntu-bookmarks.patch'
2--- debian/patches/ubuntu-bookmarks.patch 2015-07-06 13:43:50 +0000
3+++ debian/patches/ubuntu-bookmarks.patch 2016-02-19 10:48:36 +0000
4@@ -17,7 +17,6 @@
5 + <DT><A HREF="http://wiki.ubuntu.com" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACmklEQVQ4jY2TX0hTcRzFj+7v3b+7zS0357wuNTfM9bB7g2tbGGaEYkhhJbUeRiiSpkEoSKRFUgjLFgRa/qE/SBGWYGgzNMg07EGEIvxDWZnggyCUhuZ2fz2IkTbJ8/4533MOfIEtqsXnUw9XleRW+nzqLQFdRXGKkfMWfuis+eAVnrKMpSv7CEeT5ymKXgCaTcHum8my8ixlbLiBmScBGyEBG/Hn6+6Ppak+EI4mvamKKQDpEeHafK126i47cnSv3nfnuOHRmsFcnfXHiVRZfbFB2rkvXtYEwBLRYMDvbCdBD5lsZb9uUyLbYRJf1spx8YBd3jhaGTe95GcWhQYmnOOQewFEr4PddvUOoccdJkEPqT1pfQuAMxqhKuBBuXSg1WJ4Ji5YpknARl5XmN4DMAEAPDapc7Dc3F6WSRe/ueF8t9DJ/6KkqNTr1w9VAIjOuNVVoetMeNnPrOhlyAYADJ8z95CAjXyvT1goyTM3jbe65gFkA4jaWDEB0MVIcEorQQUAFkAUqvdrakINTOiB1zjZWJbUv9DJL8vFyIq0UbNN7hVYzUrIpV42ScCtHdFLRShkjJLScLc7RIIeUl1obUwGZH/DLxMhn96lGiUcTYYcytmNKcUAFC+upfWToIdMtLFzFjH4W3GUtS0R8kE7xc84Va8IRxPBpRFyaVEHANs/Ec20xDXR6prJ43VPbzPUY4HVCAKrCRGOJg+T5B9PGyR9RUZpEMBhANJINUVqChlJUhxbcWkWCUcTwtHkWQr1rcZrHVjqyvh5yWttBqCPBAMAaoHoeIAyiHAohxY1F2jFHdul0Vc/32O/kKCHjLewswAcmxqsKXN1Fy2AWAD6I3tiSoN1Oz/l7tY/AWD/r0EEKQFwWH2kP/1/Aw7z2faOzA5FAAAAAElFTkSuQmCC" ID="rdf:#$mYrW.3">Ubuntu Wiki (community-edited website)</A>
6 + <DT><A HREF="https://answers.launchpad.net/ubuntu/+addquestion" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAEgSURBVDiNpZO7SgNBGIW/2awDaTRJs7FaEdfCylcQsbT2AcTSN/ABtvAJAj6AlfYWIjaCjYWwBC0kWISQgBd0sxfntwi6Jibrmpxy5sx3Dv/MKBERZpA1upAkCXEcTwcIggDf92m1WtMBoijCGFP48C/AqKR/j3m9AkkwT2fI+y0wPDI7D5A+HGC6xyhdR+L2IHFhg7m1UyjN/93gO2WlgV6/plTfwzyfkz4eFmvwJau2PTAvLfPRPkJeLrK9IoAsroayq0jSzQdMelvydoOkPVTZy5g/DVprADqdDp6XmdK7XVAa0zsBoLS4Px7gui6O4xCG4XBy2ETCJqq8iu01sCqbQ3UnKg52pH+Za5H/DXGMcq/Rqm6h7EouQM36nT8B8aKcEoKd93oAAAAASUVORK5CYII=" ID="rdf:#$nYrW.3">Make a Support Request to the Ubuntu Community</A>
7 + <DT><A HREF="http://www.debian.org/" ICON="data:image/x-icon;base64,AAABAAQAICAAAAEACACoCAAARgAAACAgEAABAAQA6AIAAO4IAAAQEAAAAQAIAGgFAADWCwAAEBAQAAEABAAoAQAAPhEAACgAAAAgAAAAQAAAAAEACAAAAAAAgAQAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAMDcwADwyqYAACBAAAAgYAAAIIAAACCgAAAgwAAAIOAAAEAAAABAIAAAQEAAAEBgAABAgAAAQKAAAEDAAABA4AAAYAAAAGAgAABgQAAAYGAAAGCAAABgoAAAYMAAAGDgAACAAAAAgCAAAIBAAACAYAAAgIAAAICgAACAwAAAgOAAAKAAAACgIAAAoEAAAKBgAACggAAAoKAAAKDAAACg4AAAwAAAAMAgAADAQAAAwGAAAMCAAADAoAAAwMAAAMDgAADgAAAA4CAAAOBAAADgYAAA4IAAAOCgAADgwAAA4OAAQAAAAEAAIABAAEAAQABgAEAAgABAAKAAQADAAEAA4ABAIAAAQCAgAEAgQABAIGAAQCCAAEAgoABAIMAAQCDgAEBAAABAQCAAQEBAAEBAYABAQIAAQECgAEBAwABAQOAAQGAAAEBgIABAYEAAQGBgAEBggABAYKAAQGDAAEBg4ABAgAAAQIAgAECAQABAgGAAQICAAECAoABAgMAAQIDgAECgAABAoCAAQKBAAECgYABAoIAAQKCgAECgwABAoOAAQMAAAEDAIABAwEAAQMBgAEDAgABAwKAAQMDAAEDA4ABA4AAAQOAgAEDgQABA4GAAQOCAAEDgoABA4MAAQODgAIAAAACAACAAgABAAIAAYACAAIAAgACgAIAAwACAAOAAgCAAAIAgIACAIEAAgCBgAIAggACAIKAAgCDAAIAg4ACAQAAAgEAgAIBAQACAQGAAgECAAIBAoACAQMAAgEDgAIBgAACAYCAAgGBAAIBgYACAYIAAgGCgAIBgwACAYOAAgIAAAICAIACAgEAAgIBgAICAgACAgKAAgIDAAICA4ACAoAAAgKAgAICgQACAoGAAgKCAAICgoACAoMAAgKDgAIDAAACAwCAAgMBAAIDAYACAwIAAgMCgAIDAwACAwOAAgOAAAIDgIACA4EAAgOBgAIDggACA4KAAgODAAIDg4ADAAAAAwAAgAMAAQADAAGAAwACAAMAA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" ID="rdf:#$pYrW.3">Debian (Ubuntu is based on Debian)</A>
8-+ <DT><A HREF="https://one.ubuntu.com/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB9ElEQVQ4jb2Rz0uTARjH3z8j6BR1CIqMYAQeOnSIQQUdrCg7tZMjEBTEi5ewIJACiwgPYcnaq85MHfYqm2vbO7e9Tt2m7/byirG9urfN/XC8WESHfboVI9g89b0+z/fD9/s8gvA/FbXfRTrfybEN5Rf3sF4/pPTkOvNnLqJ3OZA77e0BxelzCIIgHI4+oCEO0hh3Yg5cxnPqbHvzoXSVxoqN8pztz7LhPE195DY/nl7jaKhNhe/BW/xa6iAj/hu1MmiDRyeoDF1pninjw9Tf9lJ85aAS7qEe7EZJKCRTm7jcrqblUn8HRt+lZkDBM0LD1cfR6H3KoX7qygC6rqHrGn6/r33vb6ZJbuoZpv8Ndd9NfqYfk1E+IUdCLHjnEARBEKdF3De6UE5eQLbf+QtNpZKUSkU2NhJkttapBbph5zl7K06Wlz+zKC2wvZ3Gsiw0dYtZRw9uZ29zqnQ6yVpCIRqLkJKGsRKDBOZfUikfsL9vUK1WqNWqqKpKobBHVsvw/sN462ri2BiGkeegfIBlWeSNHLquoapp1hJxJibetQbk8l8plYqYZoHd3R2ymkpWy7AalZHlIItL3taAvJFjc3OdtUScaCxCLB4lshpGjoSQIyFC4WD77wS++PH5JKQlL/MLs3hmJpn5OMmUR2TC1eYGx9VvRTF1ghnsWBgAAAAASUVORK5CYII=">Ubuntu One - The personal cloud that brings your digital life together</A>
9 + </DL>
10 + </DT>
11 <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>

Subscribers

People subscribed via source and target branches