diff --git a/LICENSE b/LICENSE
index 1466a35..9591157 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -643,15 +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
-<<<<<<< HEAD
- along with this program. If not, see .
-=======
along with this program. If not, see .
->>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh))
-=======
- along with this program. If not, see .
->>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh))
Also add information on how to contact you by electronic and paper mail.
@@ -666,14 +658,5 @@ 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
-<<<<<<< HEAD
-.
-=======
.
->>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh))
-=======
-.
-
->>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh))