X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6d7d870816a8ef1227e41f193818ab424a4d7d29..fadc722655b2ba4ebe98eece3498da3c88f8b6fc:/LICENSE?ds=sidebyside diff --git a/LICENSE b/LICENSE index 716f177..23cb790 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,7 @@ -<<<<<<< HEAD GNU GENERAL PUBLIC LICENSE -======= -GNU GENERAL PUBLIC LICENSE ->>>>>>> 32a5f32... Initial commit Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., + Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -294,13 +290,8 @@ to attach them to the start of each source file to most effectively convey 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) -======= - Next generation Vain - Copyright (C) 2013 Luke Bonham ->>>>>>> 32a5f32... Initial commit + {description} + Copyright (C) {year} {fullname} 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 @@ -338,11 +329,7 @@ necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. -<<<<<<< HEAD - , 1 April 1989 -======= {signature of Ty Coon}, 1 April 1989 ->>>>>>> 32a5f32... Initial commit Ty Coon, President of Vice This General Public License does not permit incorporating your program into