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