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 /var/spack/packages/pmgr_collective/package.py | |
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 'var/spack/packages/pmgr_collective/package.py')
-rw-r--r-- | var/spack/packages/pmgr_collective/package.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/packages/pmgr_collective/package.py b/var/spack/packages/pmgr_collective/package.py index 5d9b02acc3..1fc47c658f 100644 --- a/var/spack/packages/pmgr_collective/package.py +++ b/var/spack/packages/pmgr_collective/package.py @@ -6,7 +6,7 @@ # Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://scalability-llnl.github.io/spack +# For details, see https://github.com/llnl/spack # Please also see the LICENSE file for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify |