diff options
| author |  Tom Willemsen | 2012-10-17 20:32:50 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-17 20:32:50 +0200 |
| commit | ab3e4c680e329db4c01e6d029874124011328ba1 (patch) | |
| tree | 713ad11de3ad67d2d09f92c38965d894ea470051 | |
| parent | 5c4c72f56f3f7090a7a23eb6ee728373015918d5 (diff) | |
| download | dotfiles-ab3e4c680e329db4c01e6d029874124011328ba1.tar.gz dotfiles-ab3e4c680e329db4c01e6d029874124011328ba1.zip | |
.xinitrc
| -rwxr-xr-x | .xinitrc | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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 ] |