@@ -34,15 +34,13 @@ outgoing: # communication with search engines
3434# - 1.1.1.2
3535
3636engines:
37−<<<<<<< HEAD
3837 - name : arch linux wiki
3938 engine : archlinux
4039 shortcut : al
41−=======
40+
4241 - name : base
4342 engine : base
4443 shortcut : bs
45−>>>>>>> Add BASE engine in category Science. Basic and advanced request.
4644
4745 - name : wikipedia
4846 engine : mediawiki