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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment