From 0e03ef2a51a57d13057481713a193d09c3100c18 Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <shibanov-1997@inbox.ru>
Date: Wed, 15 Jun 2022 16:59:57 +0200
Subject: [PATCH] fix test-python.yml

---
 .github/workflows/test-python.yml | 49 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
index c2b9ffcd..31fb9c92 100644
--- a/.github/workflows/test-python.yml
+++ b/.github/workflows/test-python.yml
@@ -120,36 +120,12 @@ jobs:
     - name: Run simple code
       run: python -c 'import math; print(math.factorial(5))'
 
-<<<<<<< HEAD
-  check-latest:
-=======
   setup-dev-version:
     name: Setup 3.9-dev ${{ matrix.os }}
->>>>>>> main
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.8", "3.9", "3.10"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Python and check latest
-        uses: ./
-        with:
-          python-version: ${{ matrix.python-version }}
-          check-latest: true
-      - name: Validate version
-        run: |
-          $pythonVersion = (python --version)
-          if ("$pythonVersion" -NotMatch "${{ matrix.python }}"){
-            Write-Host "The current version is $pythonVersion; expected version is ${{ matrix.python }}"
-            exit 1
-          }
-          $pythonVersion
-        shell: pwsh
-=======
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
     - name: Checkout
@@ -171,4 +147,27 @@ jobs:
 
     - name: Run simple code
       run: python -c 'import math; print(math.factorial(5))'
->>>>>>> main
+
+  check-latest:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.8", "3.9", "3.10"]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Python and check latest
+        uses: ./
+        with:
+          python-version: ${{ matrix.python-version }}
+          check-latest: true
+      - name: Validate version
+        run: |
+          $pythonVersion = (python --version)
+          if ("$pythonVersion" -NotMatch "${{ matrix.python }}"){
+            Write-Host "The current version is $pythonVersion; expected version is ${{ matrix.python }}"
+            exit 1
+          }
+          $pythonVersion
+        shell: pwsh
\ No newline at end of file