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 /share | |
| 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 'share')
| -rw-r--r-- | share/spack/csh/spack.csh | 2 | ||||
| -rwxr-xr-x | share/spack/setup-env.csh | 2 | ||||
| -rwxr-xr-x | share/spack/setup-env.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/share/spack/csh/spack.csh b/share/spack/csh/spack.csh index b21da23836..d64ce8935b 100644 --- a/share/spack/csh/spack.csh +++ b/share/spack/csh/spack.csh @@ -101,7 +101,7 @@ case unload: breaksw default: - \spack $_sp_args + \spack $_sp_flags $_sp_args breaksw endsw diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh index 5f91670a60..42d8c42726 100755 --- a/share/spack/setup-env.csh +++ b/share/spack/setup-env.csh @@ -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 diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index b90846d28f..c96a94195d 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -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 |