summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJim Galarowicz <jeg@krellinst.org>2015-12-11 17:23:54 -0800
committerJim Galarowicz <jeg@krellinst.org>2015-12-11 17:23:54 -0800
commit0fc83ba999e8041d509b16683bdb4c90cf7d7b27 (patch)
tree19f8c3f23229435771c8b51f94a3e55673895b55 /LICENSE
parent0ced060b87b129c47666ef91f79d52d94e79e291 (diff)
parent3163d016db3849c3c9e801c1cdb9e6e907afa313 (diff)
downloadspack-0fc83ba999e8041d509b16683bdb4c90cf7d7b27.tar.gz
spack-0fc83ba999e8041d509b16683bdb4c90cf7d7b27.tar.bz2
spack-0fc83ba999e8041d509b16683bdb4c90cf7d7b27.tar.xz
spack-0fc83ba999e8041d509b16683bdb4c90cf7d7b27.zip
Fix merge conflict with papi package.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 6ad4af5861..bb7ef91b3c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,7 +5,7 @@ This file is part of Spack.
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
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License (as published by