!fixup resolve conflicts

haskell · Apr 29, 2024 · b38d082 · b38d082
1 parent 3a40d55
commit b38d082
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -66,11 +66,7 @@ jobs:
       GHC_FOR_RELEASE: ${{ format('["{0}"]', env.GHC_FOR_RELEASE) }}
     strategy:
       matrix:
-<<<<<<< HEAD
-        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-=======
-        os: [ubuntu-latest, macos-13, windows-latest]
->>>>>>> d36e0d097 (CI: force MacOS jobs to use Intel runners (`macos-13`))
+        os: ["ubuntu-latest", "macos-13", "windows-latest"]
         # If you remove something from here.. then add it to the old-ghcs job.
         ghc: ["9.8.2", "9.6.4", "9.4.8", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5"]
         exclude: