From: Luke Bonham Date: Sat, 7 Sep 2013 09:38:48 +0000 (-0700) Subject: Initial commit X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/6d7d870816a8ef1227e41f193818ab424a4d7d29?ds=inline Initial commit --- 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 Copyright (C) +======= + 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 , 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 diff --git a/README.md b/README.md new file mode 100644 index 0000000..2f3d7af --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +lain +==== + +Next generation Vain