Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d5f56d77 authored by Akhil's avatar Akhil
Browse files

Resolve merge conflicts

parents 1298d062 432febd8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ assignees: ''
**How can SearXNG fetch the information from this engine?**
<!-- List API URL, example code (using the correct markdown) and more
that could be useful for the developers in order to implement this engine.
If you don't know what to write, let this part blank.>
If you don't know what to write, let this part blank. -->

**Applicable category of this engine**
<!-- Where should this new engine fit in SearXNG? Current categories in SearXNG:
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ jobs:
    strategy:
      matrix:
        os: [ubuntu-20.04]
        python-version:  ["3.7", "3.8", "3.9", "3.10", "3.11"]
        python-version:  ["3.8", "3.9", "3.10", "3.11"]
    steps:
    - name: Checkout
      uses: actions/checkout@v2
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ on:

jobs:
  babel:
    name: "create PR for additons from weblate"
    name: "create PR for additions from weblate"
    runs-on: ubuntu-20.04
    if: ${{ github.repository_owner == 'searxng' && github.ref == 'refs/heads/master' }}
    steps:
+1 −0
Original line number Diff line number Diff line
@@ -168,3 +168,4 @@ features or generally made searx better:
- Milad Laly @Milad-Laly
- @llmII
- @blob42 `<https://blob42.xyz>`_
- Paolo Basso `<https://github.com/paolobasso99>`
 No newline at end of file
+10 −803

File changed.

Preview size limit exceeded, changes collapsed.

Loading