X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/7a4d6f5ffa594603ef83bc8b0e9945d12e082490..a4e5b806f176c8599c6423ebc2ceb3e6c1aa2be4:/LICENSE?ds=sidebyside

diff --git a/LICENSE b/LICENSE
index d159169..716f177 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
                     GNU GENERAL PUBLIC LICENSE
+=======
+GNU GENERAL PUBLIC LICENSE
+>>>>>>> 32a5f32... Initial commit
                        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.
 
+<<<<<<< HEAD
     <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
@@ -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.
 
+<<<<<<< HEAD
   <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