summaryrefslogtreecommitdiff
path: root/searx/engines
diff options
context:
space:
mode:
authorpw3t <romain@berthor.fr>2014-01-23 22:17:19 +0100
committerpw3t <romain@berthor.fr>2014-01-23 22:17:19 +0100
commitb82ba74a7dfba4b3b3d54ecfc6f99e02d473f7d1 (patch)
tree45ba9fb8634d7a079fb1199f406b08306106afcb /searx/engines
parenta01042ae616524160f32bfbca0e833b1de6dab58 (diff)
parent1dd35e9916dabd5426f92e5e0921148b439bb376 (diff)
downloadsearxng-b82ba74a7dfba4b3b3d54ecfc6f99e02d473f7d1.tar.gz
searxng-b82ba74a7dfba4b3b3d54ecfc6f99e02d473f7d1.zip
Merge branch 'ixquick' of https://github.com/pw3t/searx into ixquick
Conflicts: searx/engines/startpage.py
Diffstat (limited to 'searx/engines')
-rw-r--r--searx/engines/startpage.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py
index 756e1670f..5a6c570d1 100644
--- a/searx/engines/startpage.py
+++ b/searx/engines/startpage.py
@@ -4,7 +4,6 @@ from lxml import html
base_url = None
search_url = None
-
def request(query, params):
global search_url
query = urlencode({'q': query})[2:]