summaryrefslogtreecommitdiff
path: root/.spacemacs
AgeCommit message (Expand)Author
2017-02-08Removed irritation error from conky, and fixed merge conflictsJulian
2017-02-04StuffJulian
2017-01-31Added spacemacsJulian