minor update

8 years ago · 0b90cd42e2
parent 092e15cc1d
commit 0b90cd42e2
1 changed files with 1 additions and 3 deletions
--- 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