From 55e60805285b82c5dc1eb7bb037a77db27b459c0 Mon Sep 17 00:00:00 2001 From: Sommerwiesel Date: Wed, 18 Jun 2025 11:41:37 +0200 Subject: [PATCH] Fix broken License format --- LICENSE | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/LICENSE b/LICENSE index 92de3d0..dbbe355 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 -<<<<<<< HEAD Copyright (C) 2007 Free Software Foundation, Inc. -======= - Copyright (C) 2007 Free Software Foundation, Inc. ->>>>>>> origin/nerdvpn Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -647,11 +643,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License -<<<<<<< HEAD along with this program. If not, see . -======= - along with this program. If not, see . ->>>>>>> origin/nerdvpn Also add information on how to contact you by electronic and paper mail. @@ -666,8 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<<<<<<< HEAD . -======= -. ->>>>>>> origin/nerdvpn