From 0b90cd42e238ac046e49626a59a02cafea3ba72c Mon Sep 17 00:00:00 2001
From: jibe-b <user701@orange.fr>
Date: Tue, 29 Mar 2016 16:18:46 +0200
Subject: [PATCH] minor update

---
 searx/settings.yml | 4 +---
 1 file changed, 1 insertion(+), 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