Skip to content
Commit ab50b3f1 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'conda' into 'master' 

Fix conda env

See merge request inducer/pyopencl!74
parents 3631ac2c 9e2bb61d
Pipeline #15793 passed with stage
in 14 minutes and 53 seconds