rebased to latest commit from og repo

README.md

@@ -2,41 +2,13 @@
 
 LibreWolf settings for all platforms.
 
-<<<<<<< HEAD
-<<<<<<< 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.
-<<<<<<< HEAD
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> d79e65a (added Win location)
 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 overrides, just place your own preferences in the proper location, according to your OS and install method:
 - 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`
-<<<<<<< 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 ovveride preferences with an external file.
-=======
-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.
->>>>>>> f8a4623 (tweak)
-The old configuration (now tagged as legacy) should be considered deprecated and it will no longer be maintained.
-=======
->>>>>>> 131c061 (tweak)
-
-<<<<<<< HEAD
-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)
-=======
-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 overrides: just place your own preferences in `~/.librewolf/librewolf.overrides.cfg`.
->>>>>>> c2f6d4e (tweaks)
-=======
-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 overrides: just place your own preferences in `~/.librewolf/librewolf.overrides.cfg`, or if you are using Flatpak `~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg`.
->>>>>>> 6dbfa2e (added flatpak location)
-=======
->>>>>>> d79e65a (added Win location)
 
 ## Useful links
 - FAQ (coming soon): to help you creating your own pref file.
@@ -51,18 +23,6 @@ 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
-<<<<<<< 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.
-=======
-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)
-=======
-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.
->>>>>>> c2f6d4e (tweaks)
+Thank you to the whole LibreWolf community as once again this is entirely a community effort.