Autocommit of all changes since last autosync startup on host ares
authorJulien Valroff <julien@kirya.net>
Tue, 1 Nov 2011 07:50:23 +0000 (08:50 +0100)
committerJulien Valroff <julien@kirya.net>
Tue, 1 Nov 2011 07:50:23 +0000 (08:50 +0100)
autostart

index c281c96..e573e4d 100644 (file)
--- a/autostart
+++ b/autostart
@@ -1,7 +1,6 @@
 nitrogen --restore &
 /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 &
 /usr/lib/notify-osd/notify-osd &
-bluetooth-applet &
 gnome-power-manager &
 xscreensaver &
 volumeicon &
@@ -10,7 +9,11 @@ xcompmgr -n -f -D5 &
 tint2 &
 conky &
 clipit &
+<<<<<<< HEAD
+/usr/share/dvcs-autosync/autosync-xdg-launcher.sh & 
+=======
 /usr/share/dvcs-autosync/autosync-xdg-launcher.sh &
+>>>>>>> 62ea42655089d4e7dd69f3f508963c5af17381fb
 
 [ $(pgrep -c offlineimap) = 1 ] || tmux new-session -d -s offlineimap offlineimap &