Fix merge artifact. Ugh

opencivicdata · Nov 14, 2024 · 3f85354 · 3f85354
1 parent 8d17499
commit 3f85354
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -27,13 +27,8 @@ jobs:
           - 5432:5432
     strategy:
       matrix:
-<<<<<<< Updated upstream
         python-version: ['3.9', '3.10', '3.11', '3.12']
-        django-series: ['3.2', '4.0', '4.2']
-=======
-        python-version: ['3.7', '3.8', '3.12']
         django-series: ['4.2', '5.1']
->>>>>>> Stashed changes
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}