Resolve merge conflict

cisagov · Feb 8, 2023 · e4930a9 · e4930a9
1 parent e1424b0
commit e4930a9
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -292,14 +292,6 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: dist-${{ matrix.python-version }}
-<<<<<<< HEAD
-      - name: Install testing dependencies
-        run: |
-          python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade pytest pytest-cov pytest-dockerc
-      - name: Install the built wheel (there should only be one)
-        run: python -m pip install *.whl
-=======
           path: dist
       - id: find-wheel
         name: Get the name of the retrieved wheel (there should only be one)
@@ -308,7 +300,6 @@ jobs:
         run: python -m pip install --upgrade pip setuptools wheel
       - name: Install the built wheel (along with testing dependencies)
         run: python -m pip install ${{ steps.find-wheel.outputs.wheel }}[test]
->>>>>>> 65efbf63dbfc4f2dfaec9190d1ec9448af565f64
       - name: Run tests
         env:
           RELEASE_TAG: ${{ github.event.release.tag_name }}