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 /lib/frontend.php | |
| parent | cd8115bb1a79fcbb8853e3c5130d090b42fa3941 (diff) | |
Fix merge issue
Diffstat (limited to 'lib/frontend.php')
| -rw-r--r-- | lib/frontend.php | 3 |
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", |