From 4ab8b07fbcdd13bd4df2dfcbba278c3b0056f832 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Thu, 6 Aug 2020 10:23:22 -0400 Subject: [PATCH] Merge assets/README.txt --- assets/README.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/assets/README.txt b/assets/README.txt index ada4cacc9..678871725 100644 --- a/assets/README.txt +++ b/assets/README.txt @@ -50,12 +50,8 @@ https://discord.gg/pYDXzpX (13+) COPYRIGHT AND DISCLAIMER -<<<<<<< HEAD -Design and content on SRB2Kart is copyright 2018 by Kart Krew. -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 +Design and content on SRB2Kart is copyright 2020 by Kart Krew. +Design and content on SRB2 is copyright 1998-2020 by Sonic Team Junior. All non-original material on SRB2.ORG is copyrighted by their 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