summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjibe-b <user701@orange.fr>2016-03-29 16:18:46 +0200
committerjibe-b <user701@orange.fr>2016-03-29 16:18:46 +0200
commit0b90cd42e238ac046e49626a59a02cafea3ba72c (patch)
tree07d734e7f5ba1e86e569311220a2331abc9bbecd
parent092e15cc1db2faa6c2fffb6163c5147d386bf948 (diff)
downloadsearxng-0b90cd42e238ac046e49626a59a02cafea3ba72c.tar.gz
searxng-0b90cd42e238ac046e49626a59a02cafea3ba72c.zip
minor update
-rw-r--r--searx/settings.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/searx/settings.yml b/searx/settings.yml
index 994106bf8..462a0bcc2 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -34,15 +34,13 @@ 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