diff options
| -rw-r--r-- | kde-plasma/plasma-workspace/files/10-agent-startup.sh | 4 |
1 files changed, 0 insertions, 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 9f242331528..e2c50188365 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 |