From cba691a0da8ad2bb6ae22e2b98f6b05e5812d383 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 14 Aug 2017 04:07:02 -0400 Subject: [PATCH] Update README.md --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 4a602db1f7..7804321b4a 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,7 @@ VOREStation is a fork of the Polaris code branch, itself a fork of the Baystatio --- ### LICENSE -<<<<<<< HEAD -VOREStation is licensed under the GNU Affero General Public License version 3, which can be found in full in LICENSE-AGPL3.txt. -======= -The code for Polaris is licensed under the [GNU Affero General Public License](http://www.gnu.org/licenses/agpl.html) version 3, which can be found in full in LICENSE-AGPL3.txt. ->>>>>>> PolarisSS13/master +The code for VOREStation is licensed under the [GNU Affero General Public License](http://www.gnu.org/licenses/agpl.html) version 3, which can be found in full in LICENSE-AGPL3.txt. Code with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00) are licensed under the GNU General Public License version 3, which can be found in full in LICENSE-GPL3.txt.