summaryrefslogtreecommitdiff
path: root/crds/meta.yaml
diff options
context:
space:
mode:
authorTodd Miller <jmiller@stsci.edu>2018-10-09 16:47:47 -0400
committerTodd Miller <jmiller@stsci.edu>2018-10-09 16:47:47 -0400
commit3cb2b2d56e341d971869aa4dce8ed9f8a0e36cfa (patch)
tree70a5e41e3c0b3164c4e493b2ae589b191d6c41cb /crds/meta.yaml
parent80d21929e590ab86a1ae41dcb5004e29a43af534 (diff)
downloadastroconda-contrib-3cb2b2d56e341d971869aa4dce8ed9f8a0e36cfa.tar.gz
Updated CRDS meta.yaml for version 7.2.6, not sure about "number".
Diffstat (limited to 'crds/meta.yaml')
-rw-r--r--crds/meta.yaml8
1 files changed, 2 insertions, 6 deletions
diff --git a/crds/meta.yaml b/crds/meta.yaml
index 335bcb2..35a88cb 100644
--- a/crds/meta.yaml
+++ b/crds/meta.yaml
@@ -1,6 +1,6 @@
{% set name = 'crds' %}
-{% set version = '7.2.4' %}
-{% set number = '4' %}
+{% set version = '7.2.6' %}
+{% set number = '0' %}
about:
home: http://www.stsci.edu/hst/observatory/crds/
@@ -27,10 +27,6 @@ requirements:
- parsley
- filelock
- setuptools
-<<<<<<< HEAD
- - filelock
-=======
->>>>>>> d75fa7d104a59296efa95bafb7c17b46e7e18dd6
- python {{ python }}
run: