diff options
| author | gesang <gesang@itinerariummentis.org> | 2024-07-15 08:45:19 +0000 |
|---|---|---|
| committer | gesang <gesang@itinerariummentis.org> | 2024-07-15 08:45:19 +0000 |
| commit | cd8115bb1a79fcbb8853e3c5130d090b42fa3941 (patch) | |
| tree | d846f74ea8e5b6490b3c069900c496b032000b13 /settings.php | |
| parent | edfa4b96dcdf950eb9983a3886b5a0a2bf0674b1 (diff) | |
| parent | 029af216d48c56ad310f4ba82ac0ed2fb57d5e32 (diff) | |
Merge branch 'master' of https://git.lolcat.ca/lolcat/4get
Diffstat (limited to 'settings.php')
| -rw-r--r-- | settings.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/settings.php b/settings.php index 1be2dad..480625a 100644 --- a/settings.php +++ b/settings.php @@ -130,6 +130,17 @@ $settings = [ "text" => "Yandex" ], [ +<<<<<<< HEAD +======= + "value" => "google", + "text" => "Google" + ], + [ + "value" => "startpage", + "text" => "Startpage" + ], + [ +>>>>>>> 029af216d48c56ad310f4ba82ac0ed2fb57d5e32 "value" => "qwant", "text" => "Qwant" ], |