diff options
author | Todd Miller <jmiller@stsci.edu> | 2018-06-22 09:10:14 -0400 |
---|---|---|
committer | Todd Miller <jmiller@stsci.edu> | 2018-06-22 09:10:14 -0400 |
commit | ff7bb35c63ef298df2207dbfdc49e441cec0e2ae (patch) | |
tree | 7cb17a5919c32a5aae5f627a77a0db239d6d19af /pyraf | |
parent | e3ccb95b25b6a978e8e2da7783cc53ec6b2d698a (diff) | |
parent | f6dbc50fd6569c11c4b0286f4d30a08a56b8463e (diff) | |
download | astroconda-contrib-ff7bb35c63ef298df2207dbfdc49e441cec0e2ae.tar.gz |
Merge branch 'master' of https://github.com/astroconda/astroconda-contrib into update-crds-version to resolve version conflicts.
Diffstat (limited to 'pyraf')
-rw-r--r-- | pyraf/meta.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml index 75b8342..070cadf 100644 --- a/pyraf/meta.yaml +++ b/pyraf/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'pyraf' %} -{% set version = '2.1.14' %} +{% set version = '2.1.15' %} {% set number = '0' %} about: |