diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/config.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/data/config.php b/data/config.php index 888b4b7..0b495d7 100644 --- a/data/config.php +++ b/data/config.php @@ -122,11 +122,8 @@ class config{ const PROXY_BRAVE = false; const PROXY_FB = false; // facebook const PROXY_GOOGLE = false; -<<<<<<< HEAD const PROXY_GOOGLEALT = false;//ipv6 version of google -======= const PROXY_STARTPAGE = false; ->>>>>>> 029af216d48c56ad310f4ba82ac0ed2fb57d5e32 const PROXY_QWANT = false; const PROXY_MARGINALIA = false; const PROXY_MOJEEK = false; |