work around pocl problems (for now)

SasView · Apr 8, 2024 · 108c0c2 · 108c0c2
1 parent 4e135a1
commit 108c0c2
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -45,11 +45,8 @@ jobs:
         choco install opencl-intel-cpu-runtime
         python -m pip install --only-binary=pyopencl --find-links http://www.silx.org/pub/wheelhouse/ --trusted-host www.silx.org pyopencl
 
-<<<<<<< HEAD
-    - name: Test with pytest
-=======
     - name: Test with pytest (only on Windows for now since PoCL is failing on Ubuntu)
->>>>>>> 6b80a438 (work around pocl problems (for now))
+
       env:
         PYOPENCL_COMPILER_OUTPUT: 1
         SAS_OPENCL: none