summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/config.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/data/config.php b/data/config.php
index ae642bb..888b4b7 100644
--- a/data/config.php
+++ b/data/config.php
@@ -122,7 +122,11 @@ 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;