diff options
author | mboelen <michael@cisofy.com> | 2014-10-06 16:00:47 +0400 |
---|---|---|
committer | mboelen <michael@cisofy.com> | 2014-10-06 16:00:47 +0400 |
commit | 13fd4647b8890726aff9b3f7340f8d8c5c19b20c (patch) | |
tree | 73886efe6d20d37db2feeb42db83bc65b8a9d133 | |
parent | 2cf2a422cc920f53d2c934a519f1d8030675a38b (diff) |
Update of LICENSE file, which has version control texts in it
-rw-r--r-- | LICENSE | 16 |
1 files changed, 2 insertions, 14 deletions
@@ -1,9 +1,6 @@ -<<<<<<< HEAD + GNU GENERAL PUBLIC LICENSE -======= -GNU GENERAL PUBLIC LICENSE ->>>>>>> 02e66e323f58f34faafc43710f9d60e90f16c0fe - Version 3, 29 June 2007 + Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> 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 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 @@ -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 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. |