end to end flow for build and deploy - first attempt

ministryofjustice · Oct 17, 2024 · d32f9cc · d32f9cc
1 parent 3220581
commit d32f9cc
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -55,11 +55,7 @@ permissions:
 jobs:
   helm_lint:
     name: helm lint
-<<<<<<< HEAD
-    uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@v1 # WORKFLOW_VERSION
-=======
-    uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@main
->>>>>>> 415f7b6 (end to end flow for build and deploy - first attempt)
+    uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@v1 # WORKFLOW VERSION
     secrets: inherit
     with:
       environment: ${{ inputs.environment || 'dev' }}