From c6f21a399333b660d62d5c1eb7d9ca8a9ee92b55 Mon Sep 17 00:00:00 2001
From: fxbrit <ft.compiled@simplelogin.co>
Date: Thu, 6 May 2021 23:37:39 +0200
Subject: [PATCH] pre MR commit

---
 Changelog.md  |  4 ++++
 README.md     | 15 ++++++++++++++-
 librewolf.cfg |  3 +++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 42bc6b2..9ef2836 100755
--- a/Changelog.md
+++ b/Changelog.md
@@ -1701,6 +1701,7 @@ defaultPref("javascript.options.wasm", false); // disable web assembly
 defaultPref("webgl.disabled", true); // disable webgl
 defaultPref("privacy.resistFingerprinting.letterboxing", true); // enable letterboxing
 defaultPref("dom.event.clipboardevents.enabled", false); // disable user triggered clipboard access
+<<<<<<< HEAD
 ```
 <<<<<<< HEAD
 >>>>>>> e7a5601 (more good stuff)
@@ -1837,3 +1838,6 @@ ALL OF Disabled - Deprecated Inactive
 ALL OF Disabled - Section OFF
 ```
 >>>>>>> 57702f8 (updated changelog)
+=======
+```
+>>>>>>> d24f87c (pre MR commit)
diff --git a/README.md b/README.md
index f63cd10..1800cd6 100755
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 LibreWolf settings for all platforms.
 
+<<<<<<< HEAD
 The configuration file was revamped and it includes improvements in usability, a more curated and focused selection of privacy settings, as well as the ability to override preferences with an external file.
 The old configuration (now tagged as `legacy`) should be considered deprecated and it will no longer be maintained.
 
@@ -9,6 +10,12 @@ We encourage users to find **their own setup** and to use our default configurat
 - Most distros and macOS -> `~/.librewolf/librewolf.overrides.cfg`
 - Flatpak -> `~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg`
 - Windows -> `%USERPROFILE%\.librewolf\librewolf.overrides.cfg`
+=======
+The configuration file was revamped and it includes improvements in usability, a more curated and focused selection of privacy settings, as well as the ability to ovveride preferences with an external file.
+The old configuration (now tagged as legacy) should be considered deprecated and it will no longer be maintained.
+
+We encourage users to find **their own setup** and to use our default configuration as something to build on top of. This is now easier thanks to the ovverides: just place your own preferences in `~/.librewolf/librewolf.overrides.cfg`.
+>>>>>>> d24f87c (pre MR commit)
 
 ## Useful links
 - FAQ (coming soon): to help you creating your own pref file.
@@ -23,6 +30,12 @@ We encourage users to find **their own setup** and to use our default configurat
 This repository benefits from the knowledge and research provided by [arkenfox](https://github.com/arkenfox), their documentation was vital to this revamp, so special thanks to their project.
 We do not use arkenfox's user.js but we try to keep up with it, and we also consider it a great resource for users who want to find their own setup.
 
+<<<<<<< HEAD
 Some of the older prefs in this project are taken from [pyllyukko](https://github.com/pyllyukko/user.js/) and many more were investigated on [bugzilla](https://bugzilla.mozilla.org/home).
 
-Thank you to the whole LibreWolf community as once again this is entirely a community effort.
\ No newline at end of file
+Thank you to the whole LibreWolf community as once again this is entirely a community effort.
+=======
+Some of the older prefs in this project are taken from [pyllyukko](https://github.com/pyllyukko/user.js/) and many more were investigated in [bugzilla](https://bugzilla.mozilla.org/home).
+
+Thank you to the entire LibreWolf community as once again this is entirely a community effort.
+>>>>>>> d24f87c (pre MR commit)
diff --git a/librewolf.cfg b/librewolf.cfg
index 52e85e5..e77cbe4 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -2267,6 +2267,7 @@ lockPref("default-browser-agent.enabled", false);
 // or `~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg` (Flatpak).
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 let profile_directory;
 if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) {
   pref('autoadmin.global_config_url', `file://${profile_directory}/.librewolf/librewolf.overrides.cfg`);
@@ -2284,6 +2285,8 @@ if (home_directory) {
   pref("autoadmin.global_config_url", `file://${home_directory}/.librewolf/librewolf.overrides.cfg`);
 =======
 // expected to work on both Windows and MacOS
+=======
+>>>>>>> d24f87c (pre MR commit)
 let profile_directory;
 if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) {
   pref('autoadmin.global_config_url', `file://${profile_directory}/.librewolf/librewolf.overrides.cfg`);