From 7b2956dee722734d08ce001d7df61d513dfdd091 Mon Sep 17 00:00:00 2001
From: Francesco Ariis <fa-ml@ariis.it>
Date: Wed, 6 Mar 2024 13:51:03 +0100
Subject: [PATCH] Update licence list

Per https://github.com/haskell/cabal/wiki/Updating-the-license-list
to version 3.23 (2024-02-08) of SPDX License List.

(cherry picked from commit d0ec5d6cecc29d6285fc2164a2aaf2eab997201d)

# Conflicts:
#	license-list-data/exceptions-3.23.json
#	license-list-data/licenses-3.23.json
---
 license-list-data/exceptions-3.23.json | 6 +++++-
 license-list-data/licenses-3.23.json   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/license-list-data/exceptions-3.23.json b/license-list-data/exceptions-3.23.json
index e2ad7282499..1f21b7618f6 100644
--- a/license-list-data/exceptions-3.23.json
+++ b/license-list-data/exceptions-3.23.json
@@ -769,4 +769,8 @@
     }
   ],
   "releaseDate": "2024-02-08"
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> d0ec5d6ce (Update licence list)
diff --git a/license-list-data/licenses-3.23.json b/license-list-data/licenses-3.23.json
index 884a5e62d59..77189c62272 100644
--- a/license-list-data/licenses-3.23.json
+++ b/license-list-data/licenses-3.23.json
@@ -7994,4 +7994,8 @@
     }
   ],
   "releaseDate": "2024-02-08"
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> d0ec5d6ce (Update licence list)