From 4ca48901bf925f525d2600de0ec6c180734914b1 Mon Sep 17 00:00:00 2001 From: fxbrit Date: Fri, 7 May 2021 00:28:12 +0200 Subject: [PATCH] tweak --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index fb37613..d0a45ef 100755 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ 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. @@ -12,6 +13,9 @@ We encourage users to find **their own setup** and to use our default configurat - 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 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. <<<<<<< HEAD