diff options
Diffstat (limited to 'crds')
| -rw-r--r-- | crds/meta.yaml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crds/meta.yaml b/crds/meta.yaml index 01b916f..335bcb2 100644 --- a/crds/meta.yaml +++ b/crds/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'crds' %} {% set version = '7.2.4' %} -{% set number = '1' %} +{% set number = '4' %} about: home: http://www.stsci.edu/hst/observatory/crds/ @@ -27,6 +27,10 @@ requirements: - parsley - filelock - setuptools +<<<<<<< HEAD + - filelock +======= +>>>>>>> d75fa7d104a59296efa95bafb7c17b46e7e18dd6 - python {{ python }} run: |