From 56811bc506515cac60f83d1a86bf07d1ff088f3c Mon Sep 17 00:00:00 2001
From: AJ Slater <aj@slater.net>
Date: Thu, 21 Dec 2023 13:06:58 -0800
Subject: [PATCH] resolve LICENSE conflict

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

diff --git a/LICENSE b/LICENSE
index 4994de3..587cc7b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -673,7 +672,6 @@ 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>.
-=======
 MIT License
 
 Copyright (c) 2023 AJ Slater
@@ -695,4 +693,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
->>>>>>> a5e3e42 (initial commit)