summaryrefslogtreecommitdiffstats
path: root/recipe
diff options
context:
space:
mode:
authorTomas Kulhanek <tomas.kulhanek@stfc.ac.uk>2019-02-25 03:59:26 -0500
committerTomas Kulhanek <tomas.kulhanek@stfc.ac.uk>2019-02-25 03:59:26 -0500
commitdd9bf72ee8c7f810e9e6442105790c8950800dae (patch)
tree042b203d34d72bc00632f9fce06f61496a984ee8 /recipe
parentfc941e0941facb9437dab667ba3350db071769da (diff)
parent606d503f828777b11df4e959d6a5b25b4a86e0c7 (diff)
downloadregularization-dd9bf72ee8c7f810e9e6442105790c8950800dae.tar.gz
regularization-dd9bf72ee8c7f810e9e6442105790c8950800dae.tar.bz2
regularization-dd9bf72ee8c7f810e9e6442105790c8950800dae.tar.xz
regularization-dd9bf72ee8c7f810e9e6442105790c8950800dae.zip
Merge remote-tracking branch 'origin/newdirstructure' into newdirstructure
Diffstat (limited to 'recipe')
-rw-r--r--recipe/meta.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 61d17bd..527ad32 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -12,7 +12,8 @@ test:
files:
- ../test/lena_gray_512.tif
requires:
- - pillow=4.1.1
+ - pillow
+ - pillow=4.1.1 # [win]
requirements:
build: