Fix merge conflict flags

Merge conflict flags where kept in `.github/workflows/ubuntu_build.yml` for some reason. This commit removes them.
Quansight · Aug 25, 2023 · ea1d83c · ea1d83c
1 parent 97da475
commit ea1d83c
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml
@@ -12,25 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-=======
-        # Github Actions no longer supports Python 2.7 (June 2023)
-        # https://github.com/actions/runner-images/issues/7401
-        include:
-          - python-version: "3.6"
-            tests-dir: tests3
-          - python-version: "3.7"
-            tests-dir: tests3
-          - python-version: "3.8"
-            tests-dir: tests3
-          - python-version: "3.9"
-            tests-dir: tests3
-          - python-version: "3.10"
-            tests-dir: tests3
-          - python-version: "3.11"
-            tests-dir: tests3
->>>>>>> 67162f0 (remove macOS ARM64 builds (#1247))
 
     services: