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 /pyasdf | |
| parent | 28c2e18e1bfbb891a822da179aeeebf67320c873 (diff) | |
| parent | 4b00c5abebcd321fd95755c4816d2fd6790a172b (diff) | |
| download | cbc-recipes-97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53.tar.gz | |
Fix conflict
Diffstat (limited to 'pyasdf')
| -rw-r--r-- | pyasdf/pyasdf.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pyasdf/pyasdf.ini b/pyasdf/pyasdf.ini index d822b40..446ffb9 100644 --- a/pyasdf/pyasdf.ini +++ b/pyasdf/pyasdf.ini @@ -19,6 +19,8 @@ build: astropy pyyaml jsonschema + pytest + six setuptools python @@ -27,6 +29,7 @@ run: astropy pyyaml jsonschema + six [py27] setuptools python |