1 files changed, 4 insertions, 0 deletions
diff --git a/.xinitrc b/.xinitrc
index d4a7db4..8de9f49 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,6 +1,9 @@
 #!/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
@@ -10,6 +13,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
 fi
 
 { emacs --daemon & } && sleep 1
+>>>>>>> origin/master
 
 pidof mpdscribble >& /dev/null
 if [ $? -ne 0 ]