Merge release to esr68. a=merge FENNEC_68_0_BUILD3 FENNEC_68_0_RELEASE FIREFOX_68_0esr_BUILD2 FIREFOX_68_0esr_RELEASE
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 05 Jul 2019 18:08:51 -0400 (2019-07-05)
changeset 522809 501f4667334f5ccaee37ca013d6d1a5923e076f6
parent 522807 1570c4473f7f6c7bc523ad469a0ef8728b155d1c (current diff)
parent 522808 353628fec415324ca6aa333ab6c47d447ecc128e (diff)
child 522810 55ad5032ff435232981629bea65d50544bf9a4fb
push id45
push userryanvm@gmail.com
push dateFri, 05 Jul 2019 22:19:15 +0000 (2019-07-05)
treeherdermozilla-esr68@501f4667334f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone68.0
Merge release to esr68. a=merge
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -2405,17 +2405,16 @@ VARCACHE_PREF(
 
 VARCACHE_PREF(
   "browser.contentblocking.rejecttrackers.control-center.ui.enabled",
    browser_contentblocking_rejecttrackers_control_center_ui_enabled,
   bool, false
 )
 
 VARCACHE_PREF(
-  Live,
   "privacy.file_unique_origin",
    privacy_file_unique_origin,
   bool, true
 )
 
 // Annotate trackers using the strict list. If set to false, the basic list will
 // be used instead.
 #ifdef EARLY_BETA_OR_EARLIER