diff options
| author | gesang <gesang@itinerariummentis.org> | 2024-07-15 08:50:18 +0000 |
|---|---|---|
| committer | gesang <gesang@itinerariummentis.org> | 2024-07-15 08:50:18 +0000 |
| commit | d1209e6c239a8787cac52a3a33edb275aa4ab7cb (patch) | |
| tree | f81c98108838267efdf601da65b58f0f94001b74 /data/config.php | |
| parent | cd8115bb1a79fcbb8853e3c5130d090b42fa3941 (diff) | |
Fix merge issue
Diffstat (limited to 'data/config.php')
| -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; |