From 845d2bcf11c27ad34b9532f1ac46a3c31754abdd Mon Sep 17 00:00:00 2001
From: fxbrit <ft.compiled@simplelogin.co>
Date: Tue, 4 May 2021 12:30:45 +0200
Subject: [PATCH] moved overrides to bottom

---
 librewolf.cfg | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/librewolf.cfg b/librewolf.cfg
index 87cadb2..be38396 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -143,6 +143,7 @@ lockPref("network.cookie.thirdparty.nonsecureSessionOnly", true);
 
 // -----------------------------------
 <<<<<<< HEAD
+<<<<<<< HEAD
 // TRACKING PROTECTION
 >>>>>>> a35eb4b (re-organized and reviewed)
 =======
@@ -177,6 +178,8 @@ if (home_directory) {
 }
 
 // -----------------------------------
+=======
+>>>>>>> 344e1e8 (moved overrides to bottom)
 // TRACKING PROTECTION
 // -----------------------------------
 
@@ -2173,15 +2176,21 @@ lockPref("toolkit.winRegisterApplicationRestart", false);
 // disable Windows 8.1 Family Safety cert [WINDOWS]
 lockPref("security.family_safety.mode", 0);
 
+<<<<<<< HEAD
 // Windows only?
 lockPref("default-browser-agent.enabled", false);
 
 // -----------------------------------
 // # OVERRIDES
+=======
+// -----------------------------------
+// OVERRIDES
+>>>>>>> 344e1e8 (moved overrides to bottom)
 // -----------------------------------
 
 // allow settings to be overriden with a file at `~/.librewolf/librewolf.overrides.cfg`
 // or `~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg` (Flatpak).
+<<<<<<< HEAD
 let profile_directory;
 if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) {
   pref('autoadmin.global_config_url', `file://${profile_directory}/.librewolf/librewolf.overrides.cfg`);
@@ -2192,3 +2201,10 @@ if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) {
 =======
 lockPref("security.family_safety.mode", 0);
 >>>>>>> 48fecfd (removed redundant stuff)
+=======
+// not yet verified to work on Windows and MacOS releases
+let home_directory = getenv("HOME");
+if (home_directory) {
+  pref("autoadmin.global_config_url", `file://${home_directory}/.librewolf/librewolf.overrides.cfg`);
+}
+>>>>>>> 344e1e8 (moved overrides to bottom)