Merge branch 'master' of git.andrewyu.org:/var/www/git.andrewyu.org/www

1 files changed, 4 insertions, 0 deletions

diff --git a/index.html b/index.html
index a8908e3..e27d293 100644
--- a/index.html
+++ b/index.html
@@ -32,6 +32,10 @@
 		<p>Note: I am not always on IRC until I get my bouncer set up.  AndrewIRC won't be up until I find a sane minimal server, then install and configure it.</p>
 		<p>Caution: This server is quite new, and it seems to be in some dnsbl lists.  I'll try to get o you by other means if my email gets MX-bounced.</p>
 		<p><small>This is free and unencumbered software released into the public domain.  Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.  In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  For more information, please refer to <a href="https://unlicense.org/">https://unlicense.org</a></small></p>
+<<<<<<< HEAD
 		<p><small>I know that this website is not a program and that HTML isn't considered a programming language.  Nevertheless, you can think of the HTML as code---even the plain text i write could also be considered code since languages are a code to give information.  Anyways, stuff on here that's supposed to be public (don't try to spoof my htaccess, don't hack my ssh, don't snoop on my email, etc) is public domain, including my projects and my git repos, unless otherwise specified by a file that looks like COPYING, LICENSE or licensing stuff in the source itself. <a href="https://stpeter.im/writings/essays/publicdomain.html">https://stpeter.im/writings/essays/publicdomain.html</a> is a good explanation on why people put stuff in the public domain.</small></p>
+=======
+		<p><small>I know that this website is not a program and that HTML isn't considered a programming language.  Nevertheless, you can think of the HTML as code---even the plain text i write could also be considered code since languages are a code to give information.  Anyways, stuff on here that's supposed to be public (don't try to spoof my htaccess, don't hack my ssh, don't snoop on my email, etc) is public domain, including my projects and my git repos, unless otherwise specified by a file that looks like COPYING, LICENSE or licensing stuff in the source itself.</small></p>
+>>>>>>> 8ad97f2a7b5cd90f7a1ca81b2d6382d6a37c9eff
 	</body>
 </html>