Merge remote-tracking branch 'origin/patch-1'

Formatted startpage.py
2022-08-03 10:17:20 +02:00 · 2022-08-03 10:17:20 +02:00 · ae84fd03bb
commit ae84fd03bb
parent f204c550b9 cfbd8ad93a
1 changed files with 8 additions and 0 deletions
--- a/searx/engines/startpage.py
+++ b/searx/engines/startpage.py
@ -114,11 +114,19 @@ def request(query, params):
    #
    # [1] https://addons.mozilla.org/en-US/firefox/addon/startpage-private-search/

+<<<<<<< HEAD
    # set safesearch
    family = ''
    if params['safesearch'] == 0:
        family += '26edcb9d2db7168438f47a16f48020b9b73edd4a5fcaba97fb11ce8497dd03cdab5b7b508ab460c642ebc4b8477d08d78cd0d3da8251a5b51b03aada722a0f62ef8c78b2ead007b6c7a7ac'

+=======
+    #set safesearch
+    family = ''
+    if params['safesearch'] == 0:
+        family += '26edcb9d2db7168438f47a16f48020b9b73edd4a5fcaba97fb11ce8497dd03cdab5b7b508ab460c642ebc4b8477d08d78cd0d3da8251a5b51b03aada722a0f62ef8c78b2ead007b6c7a7ac'
+        
+>>>>>>> origin/patch-1
    args = {
        'query': query,
        'page': params['pageno'],