diff options
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" ], |