diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2017-01-05 12:19:30 -0500 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2017-01-05 12:19:30 -0500 |
| commit | cb386aa63813a7a7bd71016bc38477167822db33 (patch) | |
| tree | 44d9078960796644119b0c7fa68264997b0a3732 | |
| parent | 3b5fc24dfe413f809d8d8838b84adce9c9d3b9ed (diff) | |
| download | astroconda-contrib-cb386aa63813a7a7bd71016bc38477167822db33.tar.gz | |
Fix merged-merge conflict
| -rw-r--r-- | gwcs/meta.yaml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index ee06516..c70ca11 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -12,14 +12,9 @@ build: number: {{ number }} package: -<<<<<<< HEAD name: {{ name }} version: {{ version }} -======= - name: gwcs - version: 0.7 ->>>>>>> a96a1285ba6cc7b077ba62e2a73d4592dd78003f requirements: build: - asdf @@ -34,14 +29,9 @@ 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 |