.xinitrc

2012-10-17 20:32:50 +02:00 · 2012-10-17 20:32:50 +02:00 · ab3e4c680e
commit ab3e4c680e
parent 5c4c72f56f
1 changed files with 1 additions and 5 deletions
--- 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 ]