test - cleanup

Author: ObedAmpahECS

.github/workflows/run_smoke_test.yml

@@ -118,7 +118,6 @@ jobs:
           opa-version: ${{ needs.configuration.outputs.opa-version }}
           python-version: ${{ matrix.python-version }}
 
-<<<<<<< HEAD
       - name: Install Pytest Coverage dependencies
         run: |
           pip install pytest pytest-cov
@@ -127,8 +126,6 @@ jobs:
         run: |
           python -m pip install .
 
-=======
->>>>>>> 299903ff48b3046c8c15f95f491061c10d1b5bf8
       - name: Run ScubaGoggles and check for correct output (macos-latest)
         if: ${{ matrix.operating-system == 'macos-latest'}}
         id: mac-path
@@ -179,7 +176,6 @@ jobs:
         with:
           path: /home/runner/scubagoggles
           key: ${{ runner.os }}-baseline-${{ steps.linux-path.outputs.cachepath }}
-<<<<<<< HEAD
 
       - name: Pytest Coverage Repository
         run: |
@@ -195,8 +191,6 @@ jobs:
         uses: pypa/gh-action-pip-audit@v1.1.0
         with:
           inputs: requirements.txt
-=======
->>>>>>> 299903ff48b3046c8c15f95f491061c10d1b5bf8
 
   lhci:
     runs-on: ubuntu-latest