diff options
| author | Adam Tauber <adam.tauber@balabit.com> | 2015-02-02 09:36:43 +0100 |
|---|---|---|
| committer | Adam Tauber <adam.tauber@balabit.com> | 2015-02-02 09:36:43 +0100 |
| commit | 7f865356f9a6c1b40d0c668c59b3d081de618bac (patch) | |
| tree | 60e9acb27577968a41136c04f248c24871e83860 /searx/settings.yml | |
| parent | 03137eebd9fdfaa57452cb364c1bc9f31b243f67 (diff) | |
| parent | 5a16077455ef9e821a2b5f5f7e975be8a37ce83d (diff) | |
| download | searxng-7f865356f9a6c1b40d0c668c59b3d081de618bac.tar.gz searxng-7f865356f9a6c1b40d0c668c59b3d081de618bac.zip | |
Merge branch 'unit-tests' of https://github.com/Cqoicebordel/searx into Cqoicebordel-unit-tests
Conflicts:
searx/tests/test_engines.py
Diffstat (limited to 'searx/settings.yml')
| -rw-r--r-- | searx/settings.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/searx/settings.yml b/searx/settings.yml index f4fca8985..8c9941b36 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -161,9 +161,9 @@ engines: engine : photon shortcut : ph -# - name : piratebay -# engine : piratebay -# shortcut : tpb + - name : piratebay + engine : piratebay + shortcut : tpb - name : kickass engine : kickass |