From 13fd4647b8890726aff9b3f7340f8d8c5c19b20c Mon Sep 17 00:00:00 2001 From: mboelen Date: Mon, 6 Oct 2014 14:00:47 +0200 Subject: Update of LICENSE file, which has version control texts in it --- LICENSE | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 9cd4f9e0..a9487d06 100644 --- a/LICENSE +++ b/LICENSE @@ -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. 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 Copyright (C) -======= - {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 Copyright (C) -======= - {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. -- cgit v1.2.3