Autocommit of all changes since last autosync startup on host ares

diff --git a/autostart b/autostart
index e573e4d..9d171c2 100644 (file)
--- a/autostart
+++ b/autostart
@@ -9,11 +9,7 @@ xcompmgr -n -f -D5 &
 tint2 &
 conky &
 clipit &
 tint2 &
 conky &
 clipit &

-<<<<<<< HEAD
-/usr/share/dvcs-autosync/autosync-xdg-launcher.sh & 
-=======

 /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 &
 
 
 [ $(pgrep -c offlineimap) = 1 ] || tmux new-session -d -s offlineimap offlineimap &