diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:25:20 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:25:20 -0400 |
commit | 0c48704753e2ce6d127a151c0d53f017fa6c1f5d (patch) | |
tree | 62bc59473cfa9d66282b809d649c5ca63022f8e1 /.config/wmii | |
parent | 50f63e1b3ed7e831377f957fac49d9b44098e94e (diff) |
fix a few remaining merge conflicts
Diffstat (limited to '.config/wmii')
-rwxr-xr-x | .config/wmii/autostart | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/.config/wmii/autostart b/.config/wmii/autostart deleted file mode 100755 index 1370689..0000000 --- a/.config/wmii/autostart +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -. "$HOME/.wmii/include.sh" - -daemon lxpanel &> /dev/null -#daemon nm-applet &> /dev/null -daemon notifyd &> /dev/null -daemon blueman-applet &> /dev/null -#daemon linphone --iconified &> /dev/null - -Action rbar_cpu 01 & -Action rbar_clock 99 & |