Timothy Rice 01487380ac Resolve merge conflict %!s(int64=6) %!d(string=hai) anos
..
battery.sh a44e99bbbb Modularise xsetroot. %!s(int64=7) %!d(string=hai) anos
entropy.sh 6a41319b7a Add entropy indicator to status bar %!s(int64=6) %!d(string=hai) anos
load.sh b5714e9776 Don't block the status bar while calculating load. %!s(int64=7) %!d(string=hai) anos
locks.sh a44e99bbbb Modularise xsetroot. %!s(int64=7) %!d(string=hai) anos
time.sh a44e99bbbb Modularise xsetroot. %!s(int64=7) %!d(string=hai) anos
weather.sh a44e99bbbb Modularise xsetroot. %!s(int64=7) %!d(string=hai) anos
wifi.sh a44e99bbbb Modularise xsetroot. %!s(int64=7) %!d(string=hai) anos