Fix merge conflict from Bug 1161881's uplift a=me
authorWes Kocher <wkocher@mozilla.com>
Thu, 07 May 2015 14:31:16 -0700
changeset 255347 a3c2c1c0ebab6ec0c73843df6f0355685d31db3d
parent 255346 8051f796431e0077f03d0ed24c8d6af865719562
child 255348 4e0062607d5a41307a9a6376aff4b242a774d4aa
push id7993
push userkwierso@gmail.com
push dateThu, 07 May 2015 21:31:27 +0000
treeherdermozilla-aurora@a3c2c1c0ebab [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1161881
milestone39.0a2
Fix merge conflict from Bug 1161881's uplift a=me
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1905,23 +1905,14 @@ pref("browser.readinglist.enabled", fals
 pref("browser.readinglist.sidebarEverOpened", false);
 pref("readinglist.scheduler.enabled", false);
 pref("readinglist.server", "https://readinglist.services.mozilla.com/v1");
 
 pref("browser.reader.detectedFirstArticle", false);
 // Don't limit how many nodes we care about on desktop:
 pref("reader.parse-node-limit", 0);
 
-<<<<<<< local
-pref("browser.pocket.enabled", false);
-=======
-// Enable Service workers for desktop on non-release builds
-#ifdef NIGHTLY_BUILD
-pref("dom.serviceWorkers.enabled", true);
-#endif
-
 pref("browser.pocket.enabled", true);
->>>>>>> other
 pref("browser.pocket.api", "api.getpocket.com");
 pref("browser.pocket.site", "getpocket.com");
 pref("browser.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
 pref("browser.pocket.useLocaleList", true);
 pref("browser.pocket.enabledLocales", "en-US");