From b4fab54c7c673c7e442a8f5ddb903ab9bb7ba405 Mon Sep 17 00:00:00 2001
From: Jason Meziere <jmeziere@gmail.com>
Date: Thu, 11 Jul 2024 20:37:31 -0600
Subject: [PATCH] Update LICENSE

---
 LICENSE | 2 --
 1 file changed, 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index d48ec96..03b8ff3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 MIT License
 
 Copyright (c) 2024 Jason Meziere
@@ -695,4 +694,3 @@ 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
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
->>>>>>> 078fab0febd02aee34a8c40b8f0aee4fb6911ca1