summaryrefslogtreecommitdiff
path: root/Conky/conkymain
AgeCommit message (Expand)Author
2017-02-08Removed irritation error from conky, and fixed merge conflictsJulian
2017-01-25More conkyJulian
2017-01-23Conky updateJulian
2017-01-23Updated conkyJulian
2017-01-23Updated conkyJulian
2017-01-23Added conky configJulian