resolve conflicts

This commit is contained in:
Thorin-Oakenpants 2019-02-07 13:53:33 +00:00 committed by GitHub
parent 3e6c32ad8a
commit 601132765f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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]