diff options
Diffstat (limited to 'gwcs/meta.yaml')
| -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 |