From 0c48704753e2ce6d127a151c0d53f017fa6c1f5d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Oct 2013 19:25:20 -0400 Subject: fix a few remaining merge conflicts --- .config/wmii-hg/autostart | 16 ++++++++-------- .config/wmii/autostart | 11 ----------- .crontab.local | 0 3 files changed, 8 insertions(+), 19 deletions(-) delete mode 100755 .config/wmii/autostart delete mode 100644 .crontab.local diff --git a/.config/wmii-hg/autostart b/.config/wmii-hg/autostart index 9c47a9d..db097e1 100755 --- a/.config/wmii-hg/autostart +++ b/.config/wmii-hg/autostart @@ -1,12 +1,12 @@ #!/bin/bash . include.sh -daemon xcompmgr &> /dev/null -daemon lxpanel &> /dev/null -daemon nm-applet &> /dev/null -daemon dunst &> /dev/null +daemon xcompmgr &> /dev/null +daemon lxpanel &> /dev/null +#daemon nm-applet &> /dev/null +daemon dunst &> /dev/null +daemon blueman-applet &> /dev/null +#daemon linphone --iconified &> /dev/null -#Action rbar_cpu 01 & -#Action rbar_wifi 97 & -#Action rbar_battery 98 & -Action rbar_clock 99 & +Action rbar_cpu 01 & +Action rbar_clock 99 & 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 & diff --git a/.crontab.local b/.crontab.local deleted file mode 100644 index e69de29..0000000 -- cgit v1.2.3-2-g168b