From 6504bd99086493176e557f1f0722be21487063d3 Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Thu, 6 Feb 2025 14:08:08 +0100
Subject: [PATCH] removed old file

---
 license_header_2023.txt | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 license_header_2023.txt

diff --git a/license_header_2023.txt b/license_header_2023.txt
deleted file mode 100644
index 07bc024..0000000
--- a/license_header_2023.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-<<<<<<<< HEAD:license_header_2024.txt
-// WOLF - Copyright (C) 2020,2021,2022,2023,2024
-// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Solà Ortega (jsola@iri.upc.edu) and
-// Joan Vallvé Navarro (jvallve@iri.upc.edu)
-========
-// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Solà Ortega (jsola@iri.upc.edu)
->>>>>>>> origin/identification:license_header_2023.txt
-// All rights reserved.
-//
-// This file is part of WOLF: http://www.iri.upc.edu/wolf
-// WOLF is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- 
GitLab