Jack ad8d52c231 Remove extraneous directory		2017-08-18 16:58:46 -07:00
..
audio	Resolve merge conflict	2017-07-26 11:05:09 -07:00
bandwidth	Resolve merge conflict	2017-07-26 11:05:09 -07:00
battery	Resolve merge conflict	2017-07-26 11:05:09 -07:00
bluetooth	Resolve merge conflict	2017-07-26 11:05:09 -07:00
brightness	Resolve merge conflict	2017-07-26 11:05:09 -07:00
cmus	Resolve merge conflict	2017-07-26 11:05:09 -07:00
countdown	Resolve merge conflict	2017-07-26 11:05:09 -07:00
cpu	Resolve merge conflict	2017-07-26 11:05:09 -07:00
datetime	Resolve merge conflict	2017-07-26 11:05:09 -07:00
disk	Resolve merge conflict	2017-07-26 11:05:09 -07:00
display	Resolve merge conflict	2017-07-26 11:05:09 -07:00
feed	Resolve merge conflict	2017-07-26 11:05:09 -07:00
firewall	Resolve merge conflict	2017-07-26 11:05:09 -07:00
ip-address	Resolve merge conflict	2017-07-26 11:05:09 -07:00
keymap	Resolve merge conflict	2017-07-26 11:05:09 -07:00
keystate	Resolve merge conflict	2017-07-26 11:05:09 -07:00
launcher	Resolve merge conflict	2017-07-26 11:05:09 -07:00
load	Resolve merge conflict	2017-07-26 11:05:09 -07:00
locale	Resolve merge conflict	2017-07-26 11:05:09 -07:00
mail	Resolve merge conflict	2017-07-26 11:05:09 -07:00
memory	Resolve merge conflict	2017-07-26 11:05:09 -07:00
microphone	Resolve merge conflict	2017-07-26 11:05:09 -07:00
network	Resolve merge conflict	2017-07-26 11:05:09 -07:00
notifier	Resolve merge conflict	2017-07-26 11:05:09 -07:00
packages	Resolve merge conflict	2017-07-26 11:05:09 -07:00
playerctl	Resolve merge conflict	2017-07-26 11:05:09 -07:00
process	Resolve merge conflict	2017-07-26 11:05:09 -07:00
scroll	Resolve merge conflict	2017-07-26 11:05:09 -07:00
space	Resolve merge conflict	2017-07-26 11:05:09 -07:00
ssid	Resolve merge conflict	2017-07-26 11:05:09 -07:00
temperature	Resolve merge conflict	2017-07-26 11:05:09 -07:00
trash	Resolve merge conflict	2017-07-26 11:05:09 -07:00
usb	Resolve merge conflict	2017-07-26 11:05:09 -07:00
user	Resolve merge conflict	2017-07-26 11:05:09 -07:00
vpn	Resolve merge conflict	2017-07-26 11:05:09 -07:00
weather	Resolve merge conflict	2017-07-26 11:05:09 -07:00
webcam	Resolve merge conflict	2017-07-26 11:05:09 -07:00
window	Resolve merge conflict	2017-07-26 11:05:09 -07:00