From ed3022780a19add23581c70c5d6d918970094546 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 8 Sep 2017 20:58:33 +0000 Subject: [PATCH] Change license to comply with LANL legal request --- docs/LICENSE.md => LICENSE.md | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) rename docs/LICENSE.md => LICENSE.md (82%) diff --git a/docs/LICENSE.md b/LICENSE.md similarity index 82% rename from docs/LICENSE.md rename to LICENSE.md index 9818518..d77eb2a 100644 --- a/docs/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,4 @@ -Portions of this code (anything committed by an email address not -ending with `@lanl.gov`, or by Neale and after June 2015) are -Copyright © 2015-2016 Neale Pickett , and come with -the following license (the so-called "MIT License"). +Copyright © 2015-2016 Neale Pickett > Permission is hereby granted, free of charge, to any person > obtaining a copy of this software and associated documentation files @@ -24,26 +21,6 @@ the following license (the so-called "MIT License"). > software. -Portions of this software (everything in git committed before June -2015, or from a @lanl.gov email address) come with the following -notice. Please note that there is no assertion of copyright in this -notice. - -> This software has been authored by an employee or employees of Los -> Alamos National Security, LLC, operator of the Los Alamos National -> Laboratory (LANL) under Contract No. DE-AC52-06NA25396 with the U.S. -> Department of Energy. The U.S. Government has rights to use, -> reproduce, and distribute this software. The public may copy, -> distribute, prepare derivative works and publicly display this -> software without charge, provided that this Notice and any statement -> of authorship are reproduced on all copies. Neither the Government -> nor LANS makes any warranty, express or implied, or assumes any -> liability or responsibility for the use of this software. If -> software is modified to produce derivative works, such modified -> software should be clearly marked, so as not to confuse it with the -> version available from LANL. - - Font Licenses =============