diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2017-01-04 12:59:36 -0500 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2017-01-04 12:59:36 -0500 |
| commit | 3b5fc24dfe413f809d8d8838b84adce9c9d3b9ed (patch) | |
| tree | 63e41f437ec4fca75a978a6f4da80f2e14360a07 /gwcs | |
| parent | ae68d66ae8cab18227fa65ba783f4d58ff7f9276 (diff) | |
| parent | a96a1285ba6cc7b077ba62e2a73d4592dd78003f (diff) | |
| download | astroconda-contrib-3b5fc24dfe413f809d8d8838b84adce9c9d3b9ed.tar.gz | |
Merge branch 'master' of https://github.com/astroconda/astroconda-contrib into overhaul
Diffstat (limited to 'gwcs')
| -rw-r--r-- | gwcs/meta.yaml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index c70ca11..ee06516 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -12,9 +12,14 @@ build: number: {{ number }} package: +<<<<<<< HEAD name: {{ name }} version: {{ version }} +======= + name: gwcs + version: 0.7 +>>>>>>> a96a1285ba6cc7b077ba62e2a73d4592dd78003f requirements: build: - asdf @@ -29,9 +34,14 @@ requirements: - python x.x source: +<<<<<<< HEAD git_tag: {{ tag }} git_url: https://github.com/spacetelescope/{{ name }}.git +======= + git_tag: 0.7 + git_url: https://github.com/spacetelescope/gwcs +>>>>>>> a96a1285ba6cc7b077ba62e2a73d4592dd78003f test: imports: - gwcs |