Merge branch 'maint-poetry' of https://github.com/iluvcapra/pycmx int…

…o maint-poetry
iluvcapra · Nov 26, 2024 · f1381f5 · f1381f5
2 parents dc00b52 + 571ffde
commit f1381f5
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -16,12 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-=======
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
->>>>>>> ce1a0d32bbc349f905f9819527a2114e0688fea2
-
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}