summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE4
1 files changed, 4 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index d80eb47..a5cd534 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,10 @@
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>