From 97351a2c725ce620d452c62da07379130bafdb95 Mon Sep 17 00:00:00 2001 From: Noémi Ványi Date: Mon, 7 Jan 2019 21:28:58 +0100 Subject: fix after rebase --- tests/unit/engines/test_wikipedia.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests') diff --git a/tests/unit/engines/test_wikipedia.py b/tests/unit/engines/test_wikipedia.py index 93b3a5ab1..316b12bc5 100644 --- a/tests/unit/engines/test_wikipedia.py +++ b/tests/unit/engines/test_wikipedia.py @@ -26,15 +26,12 @@ class TestWikipediaEngine(SearxTestCase): self.assertIn('Test_Query', params['url']) self.assertNotIn('test_query', params['url']) -<<<<<<< HEAD dicto['language'] = 'nb' params = wikipedia.request(query, dicto) self.assertIn('no.wikipedia.org', params['url']) -======= dicto['language'] = 'all' params = wikipedia.request(query, dicto) self.assertIn('en', params['url']) ->>>>>>> Revert "remove 'all' option from search languages" dicto['language'] = 'xx' params = wikipedia.request(query, dicto) -- cgit v1.2.3-54-g00ecf