commit: 54f2348de8aed0a30960a340bbd762196da488a2
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 13:45:10 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 13:45:22 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=54f2348d
kde-plasma/plasma-workspace: remove stray git garbage
Package-Manager: portage-2.3.0_rc1
kde-plasma/plasma-workspace/files/10-agent-startup.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh
b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
index 9f24233..e2c5018 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
@@ -26,11 +26,7 @@ if [ "${GPG_AGENT}" = true ]; then
if [ -x /usr/bin/gpgconf ]; then
gpgconf --launch gpg-agent >/dev/null 2>&1
if [ $? = 2 ]; then
-<<<<<<< Updated upstream
eval "$(/usr/bin/gpg-agent --enable-ssh-support
--daemon)"
-=======
- eval "$(/usr/bin/gpg-agent --daemon)"
->>>>>>> Stashed changes
fi
fi
fi
