From 2b136a930a00da16aeab1de5c0219f2a62e6734b Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Fri, 15 Mar 2024 15:22:48 +0100 Subject: [PATCH] Fix conflict resolution Signed-off-by: Tim Vaillancourt --- test/templates/unit_test.tpl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl index 9d5c38a7bd0..c4992853b9a 100644 --- a/test/templates/unit_test.tpl +++ b/test/templates/unit_test.tpl @@ -50,11 +50,6 @@ jobs: with: go-version: 1.20.14 - - name: Set up python - if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.unit_tests == 'true' - uses: actions/setup-python@v4 ->>>>>>> aa377fb470 (Upgrade `release-16.0` to `go1.20.1` (#12398)) - - name: Tune the OS if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.unit_tests == 'true' run: |