summaryrefslogtreecommitdiff
path: root/searx/settings.yml
diff options
context:
space:
mode:
Diffstat (limited to 'searx/settings.yml')
-rw-r--r--searx/settings.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/searx/settings.yml b/searx/settings.yml
index 5ef74d955..994106bf8 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -34,9 +34,15 @@ outgoing: # communication with search engines
# - 1.1.1.2
engines:
+<<<<<<< HEAD
- name : arch linux wiki
engine : archlinux
shortcut : al
+=======
+ - name : base
+ engine : base
+ shortcut : bs
+>>>>>>> Add BASE engine in category Science. Basic and advanced request.
- name : wikipedia
engine : mediawiki