Fix conflict resolution

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Mar 15, 2024 · 2b136a9 · 2b136a9
1 parent 6f1a0f1
commit 2b136a9
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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: |