diff options
| author | Tom Scogland <scogland1@llnl.gov> | 2016-05-14 16:20:45 -0700 |
|---|---|---|
| committer | Tom Scogland <scogland1@llnl.gov> | 2016-05-14 16:20:45 -0700 |
| commit | 12e36ee0e731e1d76acd129c50e9b8c79af99d27 (patch) | |
| tree | c813875c7d8380d46e1bf78f0928891d5734a4ce /.mailmap | |
| parent | b5979b13e3f9bcf3e151b494bb2a557aaabedeff (diff) | |
| download | spack-12e36ee0e731e1d76acd129c50e9b8c79af99d27.tar.gz spack-12e36ee0e731e1d76acd129c50e9b8c79af99d27.tar.bz2 spack-12e36ee0e731e1d76acd129c50e9b8c79af99d27.tar.xz spack-12e36ee0e731e1d76acd129c50e9b8c79af99d27.zip | |
fix merge error
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions