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 /settings.php | |
| parent | cd8115bb1a79fcbb8853e3c5130d090b42fa3941 (diff) | |
Fix merge issue
Diffstat (limited to 'settings.php')
| -rw-r--r-- | settings.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/settings.php b/settings.php index 480625a..14d9549 100644 --- a/settings.php +++ b/settings.php @@ -130,17 +130,10 @@ $settings = [ "text" => "Yandex" ], [ -<<<<<<< HEAD -======= - "value" => "google", - "text" => "Google" - ], - [ "value" => "startpage", "text" => "Startpage" ], [ ->>>>>>> 029af216d48c56ad310f4ba82ac0ed2fb57d5e32 "value" => "qwant", "text" => "Qwant" ], |