tyler.durden
/
lynis
mirror of https://github.com/CISOfy/lynis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update of LICENSE file, which has version control texts in it

This commit is contained in:
mboelen 2014-10-06 14:00:47 +02:00
parent 2cf2a422cc
commit 13fd4647b8
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
LICENSE
View File

@ -1,9 +1,6 @@
<<<<<<< HEAD
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
======= Version 3, 29 June 2007
GNU GENERAL PUBLIC LICENSE
>>>>>>> 02e66e323f58f34faafc43710f9d60e90f16c0fe
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
@ -635,13 +632,8 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found. the "copyright" line and a pointer to where the full notice is found.
<<<<<<< HEAD
<one line to give the program's name and a brief idea of what it does.> <one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author> Copyright (C) <year> <name of author>
=======
{one line to give the program's name and a brief idea of what it does.}
Copyright (C) {year} {name of author}
>>>>>>> 02e66e323f58f34faafc43710f9d60e90f16c0fe
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -661,11 +653,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode: notice like this when it starts in an interactive mode:
<<<<<<< HEAD
<program> Copyright (C) <year> <name of author> <program> Copyright (C) <year> <name of author>
=======
{project} Copyright (C) {year} {fullname}
>>>>>>> 02e66e323f58f34faafc43710f9d60e90f16c0fe
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.