summaryrefslogtreecommitdiff
path: root/settings.php
diff options
context:
space:
mode:
Diffstat (limited to 'settings.php')
-rw-r--r--settings.php11
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"
],