summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/frontend.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/frontend.php b/lib/frontend.php
index d40ea43..74a94de 100644
--- a/lib/frontend.php
+++ b/lib/frontend.php
@@ -924,11 +924,8 @@ class frontend{
"ddg" => "DuckDuckGo",
"brave" => "Brave",
"yandex" => "Yandex",
-<<<<<<< HEAD
-=======
"google" => "Google",
"startpage" => "Startpage",
->>>>>>> 029af216d48c56ad310f4ba82ac0ed2fb57d5e32
"qwant" => "Qwant",
"yep" => "Yep",
"greppr" => "Greppr",