fix merge conflict markers

.github/workflows/main.yml

@@ -75,10 +75,7 @@ jobs:
       run: |
         echo "Verify that twine is installed"
         docker run --rm opendatacube/datacube-tests:latest twine --version
-<<<<<<< HEAD
 
-=======
->>>>>>> d6b62081 (combine docker build actions into main workflow)
         echo "Run tests"
         cat <<EOF | docker run --rm -i -v $(pwd):/code ${{ env.DOCKER_IMAGE }} bash -
           pip install -e /code/tests/drivers/fail_drivers --no-deps
@@ -92,15 +89,7 @@ jobs:
             tests \
             integration_tests
         EOF
-    - name: DockerHub Push
-      if: steps.changes.outputs.docker == 'true'
-      uses: docker/build-push-action@v4
-      with:
-        context: .
-        push: true
-        tags: ${{ env.DOCKER_IMAGE }}
 
-<<<<<<< HEAD
     - name: DockerHub Push
       if: |
         github.event_name == 'push'
@@ -113,8 +102,6 @@ jobs:
         push: true
         tags: ${{env.DOCKER_IMAGE}}
 
-=======
->>>>>>> d6b62081 (combine docker build actions into main workflow)
     - name: Build Packages
       run: |
         cat <<EOF | docker run --rm -i  \
@@ -125,10 +112,6 @@ jobs:
         ls -lh ./dist/
         twine check ./dist/*
         EOF
-<<<<<<< HEAD
-
-=======
->>>>>>> d6b62081 (combine docker build actions into main workflow)
     - name: Publish to PyPi
       if: |
         github.event_name == 'push'