From ab3e4c680e329db4c01e6d029874124011328ba1 Mon Sep 17 00:00:00 2001
From: Tom Willemsen <tom@ryuslash.org>
Date: Wed, 17 Oct 2012 20:32:50 +0200
Subject: [PATCH] .xinitrc

---
 .xinitrc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.xinitrc b/.xinitrc
index 8de9f49..c93f42a 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,9 +1,6 @@
 #!/bin/bash
 xmodmap ~/.Xmodmap
 
-<<<<<<< HEAD
-emacs --daemon &
-=======
 # Source scripts in /etc/X11/xinit/xinitrc.d/
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
     for f in /etc/X11/xinit/xinitrc.d/*; do
@@ -12,8 +9,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
     unset f
 fi
 
-{ emacs --daemon & } && sleep 1
->>>>>>> origin/master
+emacs --daemon &
 
 pidof mpdscribble >& /dev/null
 if [ $? -ne 0 ]