Merge assets/README.txt

This commit is contained in:
Sally Coolatta 2020-08-06 10:23:22 -04:00
parent 536054b3f0
commit 4ab8b07fbc

View file

@ -50,12 +50,8 @@ https://discord.gg/pYDXzpX (13+)
COPYRIGHT AND DISCLAIMER COPYRIGHT AND DISCLAIMER
<<<<<<< HEAD Design and content on SRB2Kart is copyright 2020 by Kart Krew.
Design and content on SRB2Kart is copyright 2018 by Kart Krew. Design and content on SRB2 is copyright 1998-2020 by Sonic Team Junior.
Design and content on SRB2 is copyright 1998-2018 by Sonic Team Junior.
=======
Design and content on SRB2 is copyright 1998-2019 by Sonic Team Junior.
>>>>>>> srb2/next
All non-original material on SRB2.ORG is copyrighted by their All non-original material on SRB2.ORG is copyrighted by their
respective owners, and no copyright infringement is intended. The owner respective owners, and no copyright infringement is intended. The owner
of the SRB2.ORG domain is only acting as an ISP, and is therefore not of the SRB2.ORG domain is only acting as an ISP, and is therefore not