summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorgesang <gesang@itinerariummentis.org>2024-07-15 08:45:19 +0000
committergesang <gesang@itinerariummentis.org>2024-07-15 08:45:19 +0000
commitcd8115bb1a79fcbb8853e3c5130d090b42fa3941 (patch)
treed846f74ea8e5b6490b3c069900c496b032000b13 /lib
parentedfa4b96dcdf950eb9983a3886b5a0a2bf0674b1 (diff)
parent029af216d48c56ad310f4ba82ac0ed2fb57d5e32 (diff)
Merge branch 'master' of https://git.lolcat.ca/lolcat/4get
Diffstat (limited to 'lib')
-rw-r--r--lib/frontend.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/frontend.php b/lib/frontend.php
index de8f446..d40ea43 100644
--- a/lib/frontend.php
+++ b/lib/frontend.php
@@ -924,6 +924,11 @@ class frontend{
"ddg" => "DuckDuckGo",
"brave" => "Brave",
"yandex" => "Yandex",
+<<<<<<< HEAD
+=======
+ "google" => "Google",
+ "startpage" => "Startpage",
+>>>>>>> 029af216d48c56ad310f4ba82ac0ed2fb57d5e32
"qwant" => "Qwant",
"yep" => "Yep",
"greppr" => "Greppr",