diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-21 13:23:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-21 13:23:02 -0400 |
| commit | 2f9c296fe0a943d6f7821b025ab165ea0d80084c (patch) | |
| tree | 5ce669d5b1d444a3dbf8993cb714110022665b65 | |
| parent | 1e88dfe3e8ff595d2291f0454255b8fd1a55e496 (diff) | |
| parent | 7000ec189d6aecca3cbee5c68fe877f11cf0784e (diff) | |
Merge remote-tracking branch 'origin/master' into thinkpenguin-par
Conflicts:
.config/login.sh
.config/systemd/user/default.target.wants/gpg-agent.service
| -rw-r--r-- | .config/bash/logout.sh | 2 | ||||
| -rw-r--r-- | .config/login.sh | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.config/bash/logout.sh b/.config/bash/logout.sh index a8b88c1..de4f5f7 100644 --- a/.config/bash/logout.sh +++ b/.config/bash/logout.sh @@ -5,5 +5,3 @@ if [ "$SHLVL" = 1 ]; then [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q fi - -make -C "$HOME" diff --git a/.config/login.sh b/.config/login.sh index c28ca17..e1650b2 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -71,8 +71,8 @@ export _JAVA_OPTIONS # X11 if [[ -z $XAUTHORITY ]]; then - #export XAUTHORITY="$HOME/.Xauthority" - export XAUTHORITY=$HOME/.runtime/Xauthority + export XAUTHORITY="$HOME/.Xauthority" + #export XAUTHORITY=$HOME/.runtime/Xauthority fi # D-Bus |