From 6febcbc89ee3fa255b5880b268bfbf7e453d3be0 Mon Sep 17 00:00:00 2001
From: Petr Jasek <jasekpetr@gmail.com>
Date: Wed, 13 Nov 2024 13:34:37 +0100
Subject: [PATCH] fix ci

---
 .github/workflows/tests.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 87bde6b0c..a013ba582 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,11 +21,7 @@ jobs:
 
     - uses: actions/setup-python@v4
       with:
-<<<<<<< HEAD
         python-version: ${{ matrix.python-version }}
-=======
-        python-version: 3.8
->>>>>>> origin/master
 
     - run: |
         sudo apt-get update