diff options
| author | Jim Galarowicz <jeg@krellinst.org> | 2015-12-11 17:23:54 -0800 |
|---|---|---|
| committer | Jim Galarowicz <jeg@krellinst.org> | 2015-12-11 17:23:54 -0800 |
| commit | 0fc83ba999e8041d509b16683bdb4c90cf7d7b27 (patch) | |
| tree | 19f8c3f23229435771c8b51f94a3e55673895b55 /.mailmap | |
| parent | 0ced060b87b129c47666ef91f79d52d94e79e291 (diff) | |
| parent | 3163d016db3849c3c9e801c1cdb9e6e907afa313 (diff) | |
| download | spack-0fc83ba999e8041d509b16683bdb4c90cf7d7b27.tar.gz spack-0fc83ba999e8041d509b16683bdb4c90cf7d7b27.tar.bz2 spack-0fc83ba999e8041d509b16683bdb4c90cf7d7b27.tar.xz spack-0fc83ba999e8041d509b16683bdb4c90cf7d7b27.zip | |
Fix merge conflict with papi package.
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions