summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorLuke Smith <luke@lukesmith.xyz>2022-08-15 08:02:37 -0400
committerLuke Smith <luke@lukesmith.xyz>2022-08-15 08:02:37 -0400
commit5858b22bef5f980271178272fa4e690dbfcc4c0b (patch)
tree96e084ff52fa64865003e50f65cc46861e2e950d /LICENSE
parenta63ef65ef10e33b8eb8f530dd847ef7c4ecb1c12 (diff)
ch
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE4
1 files changed, 0 insertions, 4 deletions
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>