pixfed

LICENSE

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Statement of Purpose
 
 The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
@@ -27,3 +28,20 @@ For these and/or other purposes and motivations, and without any expectation of
     Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
     Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
 
+=======
+
+No Copyright
+
+    The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.
+
+    You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission. See Other Information below.
+
+This license is acceptable for Free Cultural Works.
+Other Information
+
+    In no way are the patent or trademark rights of any person affected by CC0, nor are the rights that other persons may have in the work or in how the work is used, such as publicity or privacy rights.
+    Unless expressly stated otherwise, the person who associated a work with this deed makes no warranties about the work, and disclaims liability for all uses of the work, to the fullest extent permitted by applicable law.
+    When using or citing the work, you should not imply endorsement by the author or the affirmer.
+
+
+>>>>>>> a19e52fdda20a0ca982e320488476bb040014981

social.html

@@ -277,8 +277,8 @@
 
                                         <div class="row">
                                         <div><center>
-                                        <a class="button" href="https://pxlfd.me">pxlfd.me</a></button>
+                                        <a class="button" href="https://instaart.org/">InstaArt</a></button>
-                                        <a class="button" href="https://pixelfed.tokyo">Tokyo</a></button>
+        <a class="button" href="https://pixelfed.tokyo">Tokyo</a></button>
                                         <a class="button" href="https://pixelfed.se">Pixelfed.se</a></button>
 
                                         </center></div>