diff options
| -rw-r--r-- | LICENSE | 13 | ||||
| -rw-r--r-- | README.md | 4 |
2 files changed, 17 insertions, 0 deletions
@@ -1,4 +1,8 @@ +<<<<<<< HEAD GNU GENERAL PUBLIC LICENSE +======= +GNU GENERAL PUBLIC LICENSE +>>>>>>> 02e66e323f58f34faafc43710f9d60e90f16c0fe Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> @@ -631,8 +635,13 @@ 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 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.> 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 it under the terms of the GNU General Public License as published by @@ -652,7 +661,11 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: +<<<<<<< HEAD <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 is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/README.md b/README.md new file mode 100644 index 00000000..f56fdf70 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +lynis +===== + +Lynis - Security auditing and hardening tool for Unix/Linux based systems |