fix(ci): fix merge conflict

TheOpenDictionary · Jan 15, 2024 · 50f8bf8 · 50f8bf8
1 parent 68df180
commit 50f8bf8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,13 +39,9 @@ jobs:
       - name: Run tests
         env:
           POETRY_VIRTUALENVS_IN_PROJECT: true
-<<<<<<< HEAD
-        run: just test
-=======
         run: just test
       - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: code
           path: /home/runner/work/odict
->>>>>>> main