diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-19 09:05:27 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-19 09:05:27 +0200 |
| commit | acfeb5d04379ddfdb724688600a4bd825617a603 (patch) | |
| tree | 232fba7a4996e0d651c3f13ae8a4258bd034571d /.gitignore | |
| parent | a96eb7096de0c39d9157019525b024760d2bc80b (diff) | |
| parent | 7555c3d9492b14d30866b7c5ec0ead79347ead05 (diff) | |
| download | spack-acfeb5d04379ddfdb724688600a4bd825617a603.tar.gz spack-acfeb5d04379ddfdb724688600a4bd825617a603.tar.bz2 spack-acfeb5d04379ddfdb724688600a4bd825617a603.tar.xz spack-acfeb5d04379ddfdb724688600a4bd825617a603.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/module_refresh
Conflicts:
lib/spack/spack/test/__init__.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 040df3eafd..bfc6172a4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ /var/spack/stage /var/spack/cache *.pyc -/opt/ +/opt *~ .DS_Store .idea |