From 21b7429ffeae3a105e1851aca48cd678cf5cd2c5 Mon Sep 17 00:00:00 2001 From: Su Yang Date: Sun, 5 Jan 2025 22:19:31 +0800 Subject: [PATCH] fix: license conflict --- LICENSE | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/LICENSE b/LICENSE index 6d194b1c..f288702d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 -<<<<<<< HEAD Copyright (C) 2007 Free Software Foundation, Inc. -======= - Copyright (C) 2007 Free Software Foundation, Inc. ->>>>>>> origin/dev Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -649,11 +645,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License -<<<<<<< HEAD along with this program. If not, see . -======= - along with this program. If not, see . ->>>>>>> origin/dev Also add information on how to contact you by electronic and paper mail. @@ -672,19 +664,11 @@ might be different; for a GUI interface, you would use an "about box". 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 GPL, see -<<<<<<< HEAD . -======= -. ->>>>>>> origin/dev The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -<<<<<<< HEAD . -======= -. ->>>>>>> origin/dev