From 601132765f3f00f72c67645ef612886f6ca234b8 Mon Sep 17 00:00:00 2001 From: Thorin-Oakenpants Date: Thu, 7 Feb 2019 13:53:33 +0000 Subject: [PATCH] resolve conflicts --- user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user.js b/user.js index 0577116..4dae06b 100644 --- a/user.js +++ b/user.js @@ -168,7 +168,7 @@ user_pref("intl.regional_prefs.use_os_locales", false); * Optionally enable logging to the console (defaults to false) ***/ user_pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); // user_pref("geo.wifi.logging.enabled", true); // [HIDDEN PREF] -/* 0211: don't use the OS's geolocation service ***/ +/* 0211: disable using the OS's geolocation service ***/ user_pref("geo.provider.ms-windows-location", false); // [WINDOWS] user_pref("geo.provider.use_corelocation", false); // [MAC] user_pref("geo.provider.use_gpsd", false); // [LINUX]