From 5858b22bef5f980271178272fa4e690dbfcc4c0b Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Mon, 15 Aug 2022 08:02:37 -0400
Subject: ch

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

(limited to 'LICENSE')

diff --git a/LICENSE b/LICENSE
index a5cd534..3cbf420 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,6 @@
 MIT/X Consortium License
 
-<<<<<<< HEAD
-© 2014-2020 Hiltjo Posthuma <hiltjo at codemadness dot org>
-=======
 © 2014-2022 Hiltjo Posthuma <hiltjo at codemadness dot org>
->>>>>>> suckless-master
 © 2018 Devin J. Pohly <djpohly at gmail dot com>
 © 2014-2017 Quentin Rameau <quinq at fifth dot space>
 © 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com>
-- 
cgit v1.2.3