Updated fs (markdown)

[etc/awesome.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index d159169d1050894d3ea3b98e1c965c4058208fe1..716f177904e59aa7672558ef7da3264665bb0766 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,8 @@
+<<<<<<< HEAD

                     GNU GENERAL PUBLIC LICENSE
                     GNU GENERAL PUBLIC LICENSE

+=======
+GNU GENERAL PUBLIC LICENSE
+>>>>>>> 32a5f32... Initial commit

                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,


@@ -290,8 +294,13 @@ 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.
 
 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

     <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>

+=======
+    Next generation Vain
+    Copyright (C) 2013  Luke Bonham
+>>>>>>> 32a5f32... Initial commit

 
     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
 
     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


@@ -329,7 +338,11 @@ 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.
 
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 

+<<<<<<< HEAD

   <signature of Ty Coon>, 1 April 1989
   <signature of Ty Coon>, 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
   Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into