From 7c965bf9ba9c2477e203d2aa91cb532eab37f0f0 Mon Sep 17 00:00:00 2001
From: Julien Valroff <julien@kirya.net>
Date: Tue, 1 Nov 2011 15:20:23 +0100
Subject: [PATCH] Autocommit of all changes since last autosync startup on host
 ares

---
 autostart | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/autostart b/autostart
index e573e4d..9d171c2 100644
--- a/autostart
+++ b/autostart
@@ -9,11 +9,7 @@ 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 &
 
-- 
2.20.1