diff options
| author | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 14:12:20 -0400 |
|---|---|---|
| committer | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 14:12:20 -0400 |
| commit | 97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53 (patch) | |
| tree | b85aa67a9968cf37c1ea5a0e38545f77ebd01b00 /stsci.stimage | |
| parent | 28c2e18e1bfbb891a822da179aeeebf67320c873 (diff) | |
| parent | 4b00c5abebcd321fd95755c4816d2fd6790a172b (diff) | |
| download | cbc-recipes-97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53.tar.gz | |
Fix conflict
Diffstat (limited to 'stsci.stimage')
| -rw-r--r-- | stsci.stimage/stsci.stimage.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stsci.stimage/stsci.stimage.ini b/stsci.stimage/stsci.stimage.ini index 49576ba..f73a22c 100644 --- a/stsci.stimage/stsci.stimage.ini +++ b/stsci.stimage/stsci.stimage.ini @@ -1,6 +1,6 @@ [package] name: stsci.stimage -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} @@ -13,7 +13,7 @@ git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name} [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} # Namespace package workaround -#preserve_egg_dir: yes +preserve_egg_dir: yes [requirements] build: |