diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2022-08-15 07:55:34 -0400 |
|---|---|---|
| committer | Luke Smith <luke@lukesmith.xyz> | 2022-08-15 07:55:34 -0400 |
| commit | a63ef65ef10e33b8eb8f530dd847ef7c4ecb1c12 (patch) | |
| tree | ea56c7cc8b51dfc8bc91fda72f1d9fd3717fe882 /LICENSE | |
| parent | 2e2d560516765e301e0425c2fbf783825334f9a1 (diff) | |
| parent | f5b5452eac468760c2972daf184f18e16f03d1ff (diff) | |
Merge branch 'lukesmith-0.8.5' of https://github.com/equwal/st into equwal-lukesmith-0.8.5
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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> |