chore: missing merge conflicts

ZcashFoundation · Oct 18, 2023 · 9afdbeb · 9afdbeb
1 parent 0401bec
commit 9afdbeb
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/workflows/sub-test-zebra-config.yml b/.github/workflows/sub-test-zebra-config.yml
@@ -14,13 +14,10 @@ on:
         description: 'Patterns to grep for in the logs'
 
       # Test selection and parameters
-<<<<<<< HEAD
-=======
       docker_image:
         required: true
         type: string
         description: 'Docker image to test'
->>>>>>> main
       test_variables:
         required: true
         type: string
@@ -50,13 +47,8 @@ jobs:
 
       - name: Run ${{ inputs.test_id }} test
         run: |
-<<<<<<< HEAD
-          docker pull ${{ vars.GAR_BASE }}/${{ vars.CI_IMAGE_NAME }}:sha-${{ env.GITHUB_SHA_SHORT }}
-          docker run ${{ inputs.test_variables }} --detach --name ${{ inputs.test_id }} -t ${{ vars.GAR_BASE }}/${{ vars.CI_IMAGE_NAME }}:sha-${{ env.GITHUB_SHA_SHORT }} zebrad start
-=======
           docker pull ${{ inputs.docker_image }}
           docker run ${{ inputs.test_variables }} --detach --name ${{ inputs.test_id }} -t ${{ inputs.docker_image }} zebrad start
->>>>>>> main
           # Use a subshell to handle the broken pipe error gracefully
           (
             trap "" PIPE;