From 8c398d79c6eee615ec8381400de2ba6904abcf55 Mon Sep 17 00:00:00 2001 From: fxbrit Date: Thu, 6 May 2021 23:39:26 +0200 Subject: [PATCH] tweaks --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 1800cd6..fb37613 100755 --- a/README.md +++ b/README.md @@ -14,8 +14,12 @@ We encourage users to find **their own setup** and to use our default configurat 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. +<<<<<<< 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) ## Useful links - FAQ (coming soon): to help you creating your own pref file. @@ -30,6 +34,7 @@ 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). @@ -39,3 +44,8 @@ Some of the older prefs in this project are taken from [pyllyukko](https://githu 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)